Revert "Expand optimization of Array(e1, ..., en) to primitive arrays."

This reverts commit 8265175ecc42293997d59049f430396c77a2b891.

5 files changed, 11 insertions, 106 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/CleanUp.scala b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
index 6af7b78181..122a37c0c6 100644
--- a/src/compiler/scala/tools/nsc/transform/CleanUp.scala
+++ b/src/compiler/scala/tools/nsc/transform/CleanUp.scala
@@ -629,13 +629,6 @@ abstract class CleanUp extends Transform with ast.TreeDSL {
             _.tpe.resultType.dealias.typeSymbol == ObjectClass  // [T: ClassTag](xs: T*): Array[T] post erasure
           }) =>
         super.transform(arg)
-      case Apply(appMeth, List(elem0, Apply(wrapArrayMeth, List(rest @ ArrayValue(elemtpt, _)))))
-      if wrapArrayMeth.symbol == Predef_wrapArray(elemtpt.tpe) &&
-         appMeth.symbol == ArrayModule_overloadedApply.suchThat {
-           tp => tp.tpe.paramss.flatten.lift.apply(1).exists(_.tpe.typeSymbol == SeqClass) &&
-             tp.tpe.resultType =:= arrayType(elemtpt.tpe) // (p1: AnyVal1, ps: AnyVal1*): Array[AnyVal1] post erasure
-         } =>
-        super.transform(rest.copy(elems = elem0 :: rest.elems))
 
       case _ =>
         super.transform(tree)
diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala
index 514844a5fa..0b8550be37 100644
--- a/src/library/scala/Array.scala
+++ b/src/library/scala/Array.scala
@@ -115,8 +115,6 @@ object Array extends FallbackArrayBuilding {
    *  @param xs the elements to put in the array
    *  @return an array containing all elements from xs.
    */
-  // Subject to a compiler optimization in Cleanup.
-  // Array(e0, ..., en) is translated to { val a = new Array(3); a(i) = ei; a }
   def apply[T: ClassTag](xs: T*): Array[T] = {
     val array = new Array[T](xs.length)
     var i = 0
@@ -125,7 +123,6 @@ object Array extends FallbackArrayBuilding {
   }
 
   /** Creates an array of `Boolean` objects */
-  // Subject to a compiler optimization in Cleanup, see above.
   def apply(x: Boolean, xs: Boolean*): Array[Boolean] = {
     val array = new Array[Boolean](xs.length + 1)
     array(0) = x
@@ -135,7 +132,6 @@ object Array extends FallbackArrayBuilding {
   }
 
   /** Creates an array of `Byte` objects */
-  // Subject to a compiler optimization in Cleanup, see above.
   def apply(x: Byte, xs: Byte*): Array[Byte] = {
     val array = new Array[Byte](xs.length + 1)
     array(0) = x
@@ -145,7 +141,6 @@ object Array extends FallbackArrayBuilding {
   }
 
   /** Creates an array of `Short` objects */
-  // Subject to a compiler optimization in Cleanup, see above.
   def apply(x: Short, xs: Short*): Array[Short] = {
     val array = new Array[Short](xs.length + 1)
     array(0) = x
@@ -155,7 +150,6 @@ object Array extends FallbackArrayBuilding {
   }
 
   /** Creates an array of `Char` objects */
-  // Subject to a compiler optimization in Cleanup, see above.
   def apply(x: Char, xs: Char*): Array[Char] = {
     val array = new Array[Char](xs.length + 1)
     array(0) = x
@@ -165,7 +159,6 @@ object Array extends FallbackArrayBuilding {
   }
 
   /** Creates an array of `Int` objects */
-  // Subject to a compiler optimization in Cleanup, see above.
   def apply(x: Int, xs: Int*): Array[Int] = {
     val array = new Array[Int](xs.length + 1)
     array(0) = x
@@ -175,7 +168,6 @@ object Array extends FallbackArrayBuilding {
   }
 
   /** Creates an array of `Long` objects */
-  // Subject to a compiler optimization in Cleanup, see above.
   def apply(x: Long, xs: Long*): Array[Long] = {
     val array = new Array[Long](xs.length + 1)
     array(0) = x
@@ -185,7 +177,6 @@ object Array extends FallbackArrayBuilding {
   }
 
   /** Creates an array of `Float` objects */
-  // Subject to a compiler optimization in Cleanup, see above.
   def apply(x: Float, xs: Float*): Array[Float] = {
     val array = new Array[Float](xs.length + 1)
     array(0) = x
@@ -195,7 +186,6 @@ object Array extends FallbackArrayBuilding {
   }
 
   /** Creates an array of `Double` objects */
-  // Subject to a compiler optimization in Cleanup, see above.
   def apply(x: Double, xs: Double*): Array[Double] = {
     val array = new Array[Double](xs.length + 1)
     array(0) = x
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala
index 60a1913548..5c982742bc 100644
--- a/src/reflect/scala/reflect/internal/Definitions.scala
+++ b/src/reflect/scala/reflect/internal/Definitions.scala
@@ -340,13 +340,12 @@ trait Definitions extends api.StandardDefinitions {
     lazy val PredefModule      = requiredModule[scala.Predef.type]
     lazy val PredefModuleClass = PredefModule.moduleClass
 
-      def Predef_classOf             = getMemberMethod(PredefModule, nme.classOf)
-      def Predef_identity            = getMemberMethod(PredefModule, nme.identity)
-      def Predef_conforms            = getMemberMethod(PredefModule, nme.conforms)
-    def Predef_wrapRefArray        = getMemberMethod(PredefModule, nme.wrapRefArray)
-    def Predef_wrapArray(tp: Type) = getMemberMethod(PredefModule, wrapArrayMethodName(tp))
-    def Predef_???                 = getMemberMethod(PredefModule, nme.???)
-    def Predef_implicitly          = getMemberMethod(PredefModule, nme.implicitly)
+      def Predef_classOf      = getMemberMethod(PredefModule, nme.classOf)
+      def Predef_identity     = getMemberMethod(PredefModule, nme.identity)
+      def Predef_conforms     = getMemberMethod(PredefModule, nme.conforms)
+      def Predef_wrapRefArray = getMemberMethod(PredefModule, nme.wrapRefArray)
+      def Predef_???          = getMemberMethod(PredefModule, nme.???)
+      def Predef_implicitly   = getMemberMethod(PredefModule, nme.implicitly)
 
     /** Is `sym` a member of Predef with the given name?
      *  Note: DON't replace this by sym == Predef_conforms/etc, as Predef_conforms is a `def`
diff --git a/test/files/instrumented/t6611.scala b/test/files/instrumented/t6611.scala
index 4c52f8a5ef..821d5f3fbf 100644
--- a/test/files/instrumented/t6611.scala
+++ b/test/files/instrumented/t6611.scala
@@ -5,29 +5,7 @@ object Test {
     startProfiling()
 
     // tests optimization in Cleanup for varargs reference arrays
-    Array("")
-
-
-    Array(true)
-    Array(true, false)
-    Array(1: Byte)
-    Array(1: Byte, 2: Byte)
-    Array(1: Short)
-    Array(1: Short, 2: Short)
-    Array(1)
-    Array(1, 2)
-    Array(1L)
-    Array(1L, 2L)
-    Array(1d)
-    Array(1d, 2d)
-    Array(1f)
-    Array(1f, 2f)
-
-    /* Not currently optimized:
-    Array[Int](1, 2) etc
-    Array(())
-    Array((), ())
-    */
+    val a = Array("")
 
     stopProfiling()
     printStatistics()
diff --git a/test/files/run/t6611.scala b/test/files/run/t6611.scala
index c295368aea..c0297372f0 100644
--- a/test/files/run/t6611.scala
+++ b/test/files/run/t6611.scala
@@ -1,61 +1,6 @@
 object Test extends App {
-  locally {
-    val a = Array("1")
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array("1": Object)
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array(true)
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array(1: Short)
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array(1: Byte)
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array(1)
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array(1L)
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array(1f)
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array(1d)
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
-
-  locally {
-    val a = Array(())
-    val a2 = Array(a: _*)
-    assert(a ne a2)
-  }
+	val a = Array("1")
+  val a2 = Array(a: _*)
+  a2(0) = "2"
+  assert(a(0) == "1")
 }