Merge pull request #3869 from abeln/wrapped-array

Fix #3675: don't unnecessarily wrap arrays when eliminating java varargs

Author: allanrenucci

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -9,6 +9,7 @@ import scala.collection.{ mutable, immutable }
 import PartialFunction._
 import collection.mutable
 import util.common.alwaysZero
+import dotty.tools.dotc.transform.TreeGen
 
 object Definitions {
 
@@ -338,6 +339,11 @@ class Definitions {
     def Predef_classOf(implicit ctx: Context) = Predef_classOfR.symbol
     lazy val Predef_undefinedR = ScalaPredefModule.requiredMethodRef("???")
     def Predef_undefined(implicit ctx: Context) = Predef_undefinedR.symbol
+    // The set of all wrap{X, Ref}Array methods, where X is a value type
+    val Predef_wrapArray = new PerRun[collection.Set[Symbol]]({ implicit ctx =>
+      val methodNames = ScalaValueTypes.map(TreeGen.wrapArrayMethodName) + nme.wrapRefArray
+      methodNames.map(ScalaPredefModule.requiredMethodRef(_).symbol)
+    })
 
   lazy val ScalaRuntimeModuleRef = ctx.requiredModuleRef("scala.runtime.ScalaRunTime")
   def ScalaRuntimeModule(implicit ctx: Context) = ScalaRuntimeModuleRef.symbol

compiler/src/dotty/tools/dotc/transform/ElimRepeated.scala

@@ -94,6 +94,8 @@ class ElimRepeated extends MiniPhase with InfoTransformer { thisPhase =>
   private def seqToArray(tree: Tree, pt: Type)(implicit ctx: Context): Tree = tree match {
     case SeqLiteral(elems, elemtpt) =>
       JavaSeqLiteral(elems, elemtpt)
+    case app@Apply(fun, args) if defn.Predef_wrapArray().contains(fun.symbol) => // rewrite a call to `wrapXArray(arr)` to `arr`
+      args.head
     case _ =>
       val elemType = tree.tpe.elemType
       var elemClass = elemType.classSymbol

compiler/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala

@@ -187,4 +187,30 @@ class TestBCode extends DottyBytecodeTest {
         diffInstructions(instructions1, instructions2))
     }
   }
+
+  /** Verifies that arrays are not unnecessarily wrapped when passed to Java varargs methods */
+  @Test def dontWrapArraysInJavaVarargs = {
+    val source =
+      """
+        |import java.nio.file._
+        |class Test {
+        |  def test(xs: Array[String]) = {
+        |     val p4 = Paths.get("Hello", xs: _*)
+        |  }
+        |}
+      """.stripMargin
+
+    checkBCode(source) { dir =>
+      val moduleIn = dir.lookupName("Test.class", directory = false)
+      val moduleNode = loadClassNode(moduleIn.input)
+      val method = getMethod(moduleNode, "test")
+
+      val arrayWrapped = instructionsFromMethod(method).exists {
+        case inv: Invoke => inv.name.contains("wrapRefArray")
+        case _ => false
+      }
+
+      assert(!arrayWrapped, "Arrays should not be wrapped when passed to a Java varargs method\n")
+    }
+  }
 }