Merge pull request #1582 from retronym/ticket/revert-primitive-array-opt

Ticket/revert primitive array opt

2 files changed, 5 insertions, 82 deletions

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")
 }