Inline genUnchecked at its two call sites.

sjrd · sjrd · commit 08d0286e2102 · 2024-02-17T23:21:48.000+01:00
It had been factored out in `SJSGen` because of one condition that
happens to be repeated. However, it is clearer that it does the
right thing at each of its call sites. Given the amount of
information that needed to be passed to this helper, inlining it
twice actually removes additional checks. Ultimately, it seems
simpler this way.
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/CoreJSLib.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/CoreJSLib.scala
@@ -1171,7 +1171,10 @@ private[emitter] object CoreJSLib {
               // Both values have the same "data" (could also be falsy values)
               If(srcData && genIdentBracketSelect(srcData, "isArrayClass"), {
                 // Fast path: the values are array of the same type
-                genUncheckedArraycopy(List(src, srcPos, dest, destPos, length))
+                if (esVersion >= ESVersion.ES2015 && nullPointers == CheckedBehavior.Unchecked)
+                  Apply(src DOT "copyTo", List(srcPos, dest, destPos, length))
+                else
+                  genCallHelper(VarField.systemArraycopy, src, srcPos, dest, destPos, length)
               }, {
                 genCallHelper(VarField.throwArrayStoreException, Null())
               })
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/FunctionEmitter.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/FunctionEmitter.scala
@@ -875,12 +875,19 @@ private[emitter] class FunctionEmitter(sjsGen: SJSGen) {
             implicit val env = env0
             val jsArgs = newArgs.map(transformExprNoChar(_))
 
+            def genUnchecked(): js.Tree = {
+              if (esFeatures.esVersion >= ESVersion.ES2015 && semantics.nullPointers == CheckedBehavior.Unchecked)
+                js.Apply(jsArgs.head DOT "copyTo", jsArgs.tail)
+              else
+                genCallHelper(VarField.systemArraycopy, jsArgs: _*)
+            }
+
             if (semantics.arrayStores == Unchecked) {
-              genUncheckedArraycopy(jsArgs)
+              genUnchecked()
             } else {
               (src.tpe, dest.tpe) match {
                 case (PrimArray(srcPrimRef), PrimArray(destPrimRef)) if srcPrimRef == destPrimRef =>
-                  genUncheckedArraycopy(jsArgs)
+                  genUnchecked()
                 case (RefArray(), RefArray()) =>
                   genCallHelper(VarField.systemArraycopyRefs, jsArgs: _*)
                 case _ =>
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/SJSGen.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/SJSGen.scala
@@ -149,20 +149,6 @@ private[emitter] final class SJSGen(
     }
   }
 
-  def genUncheckedArraycopy(args: List[Tree])(
-      implicit moduleContext: ModuleContext, globalKnowledge: GlobalKnowledge,
-      pos: Position): Tree = {
-    import TreeDSL._
-
-    assert(args.lengthCompare(5) == 0,
-        s"wrong number of args for genUncheckedArrayCopy: $args")
-
-    if (esFeatures.esVersion >= ESVersion.ES2015 && semantics.nullPointers == CheckedBehavior.Unchecked)
-      Apply(args.head DOT "copyTo", args.tail)
-    else
-      genCallHelper(VarField.systemArraycopy, args: _*)
-  }
-
   def genSelect(receiver: Tree, field: irt.FieldIdent)(
       implicit pos: Position): Tree = {
     DotSelect(receiver, Ident(genName(field.name))(field.pos))
