4 files changed, 92 insertions, 5 deletions
diff --git a/test/files/instrumented/t6611.scala b/test/files/instrumented/t6611.scala
index 821d5f3fbf..4c52f8a5ef 100644
--- a/test/files/instrumented/t6611.scala
+++ b/test/files/instrumented/t6611.scala
@@ -5,7 +5,29 @@ object Test {
     startProfiling()
 
     // tests optimization in Cleanup for varargs reference arrays
-    val a = Array("")
+    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((), ())
+    */
 
     stopProfiling()
     printStatistics()
diff --git a/test/files/neg/t6357.check b/test/files/neg/t6357.check
new file mode 100644
index 0000000000..a534d1439a
--- /dev/null
+++ b/test/files/neg/t6357.check
@@ -0,0 +1,4 @@
+t6357.scala:3: error: value class may not be a local class
+      final class Y(val j: Int) extends AnyVal
+                  ^
+one error found
diff --git a/test/files/neg/t6357.scala b/test/files/neg/t6357.scala
new file mode 100644
index 0000000000..47f5629638
--- /dev/null
+++ b/test/files/neg/t6357.scala
@@ -0,0 +1,6 @@
+object K {
+   def q = {
+      final class Y(val j: Int) extends AnyVal
+      3
+   }
+}
diff --git a/test/files/run/t6611.scala b/test/files/run/t6611.scala
index c0297372f0..c295368aea 100644
--- a/test/files/run/t6611.scala
+++ b/test/files/run/t6611.scala
@@ -1,6 +1,61 @@
 object Test extends App {
-	val a = Array("1")
-  val a2 = Array(a: _*)
-  a2(0) = "2"
-  assert(a(0) == "1")
+  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)
+  }
 }