10 files changed, 117 insertions, 33 deletions
diff --git a/test/files/run/reflection-magicsymbols-repl.check b/test/files/run/reflection-magicsymbols-repl.check
new file mode 100644
index 0000000000..d2ef4ad3cd
--- /dev/null
+++ b/test/files/run/reflection-magicsymbols-repl.check
@@ -0,0 +1,39 @@
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 
+
+scala> import scala.reflect.runtime.universe._
+import scala.reflect.runtime.universe._
+
+scala> class A {
+  def foo1(x: Int*) = ???
+  def foo2(x: => Int) = ???
+  def foo3(x: Any) = ???
+  def foo4(x: AnyRef) = ???
+  def foo5(x: AnyVal) = ???
+  def foo6(x: Null) = ???
+  def foo7(x: Nothing) = ???
+  def foo8(x: Singleton) = ???
+}
+defined class A
+
+scala> def test(n: Int): Unit = {
+  val sig = typeOf[A] member newTermName("foo" + n) typeSignature
+  val x = sig.asInstanceOf[MethodType].params.head
+  println(x.typeSignature)
+}
+warning: there were 1 feature warnings; re-run with -feature for details
+test: (n: Int)Unit
+
+scala> for (i <- 1 to 8) test(i)
+scala.Int*
+=> scala.Int
+scala.Any
+scala.AnyRef
+scala.AnyVal
+scala.Null
+scala.Nothing
+scala.Singleton
+
+scala> 
diff --git a/test/files/run/reflection-magicsymbols-repl.scala b/test/files/run/reflection-magicsymbols-repl.scala
new file mode 100644
index 0000000000..26127b8661
--- /dev/null
+++ b/test/files/run/reflection-magicsymbols-repl.scala
@@ -0,0 +1,23 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  def code = """
+    |import scala.reflect.runtime.universe._
+    |class A {
+    |  def foo1(x: Int*) = ???
+    |  def foo2(x: => Int) = ???
+    |  def foo3(x: Any) = ???
+    |  def foo4(x: AnyRef) = ???
+    |  def foo5(x: AnyVal) = ???
+    |  def foo6(x: Null) = ???
+    |  def foo7(x: Nothing) = ???
+    |  def foo8(x: Singleton) = ???
+    |}
+    |def test(n: Int): Unit = {
+    |  val sig = typeOf[A] member newTermName("foo" + n) typeSignature
+    |  val x = sig.asInstanceOf[MethodType].params.head
+    |  println(x.typeSignature)
+    |}
+    |for (i <- 1 to 8) test(i)
+    |""".stripMargin
+}
diff --git a/test/files/run/reflection-magicsymbols-vanilla.check b/test/files/run/reflection-magicsymbols-vanilla.check
new file mode 100644
index 0000000000..4f4e8d94a9
--- /dev/null
+++ b/test/files/run/reflection-magicsymbols-vanilla.check
@@ -0,0 +1,8 @@
+Int*
+=> Int
+Any
+AnyRef
+AnyVal
+Null
+Nothing
+Singleton
diff --git a/test/files/run/reflection-magicsymbols-vanilla.scala b/test/files/run/reflection-magicsymbols-vanilla.scala
new file mode 100644
index 0000000000..32819dcc46
--- /dev/null
+++ b/test/files/run/reflection-magicsymbols-vanilla.scala
@@ -0,0 +1,20 @@
+class A {
+  def foo1(x: Int*) = ???
+  def foo2(x: => Int) = ???
+  def foo3(x: Any) = ???
+  def foo4(x: AnyRef) = ???
+  def foo5(x: AnyVal) = ???
+  def foo6(x: Null) = ???
+  def foo7(x: Nothing) = ???
+  def foo8(x: Singleton) = ???
+}
+
+object Test extends App {
+  import scala.reflect.runtime.universe._
+  def test(n: Int): Unit = {
+    val sig = typeOf[A] member newTermName("foo" + n) typeSignature
+    val x = sig.asInstanceOf[MethodType].params.head
+    println(x.typeSignature)
+  }
+  for (i <- 1 to 8) test(i)
+}
diff --git a/test/files/run/reflection-magicsymbols.check b/test/files/run/reflection-magicsymbols.check
deleted file mode 100644
index 2600847d99..0000000000
--- a/test/files/run/reflection-magicsymbols.check
+++ /dev/null
@@ -1,22 +0,0 @@
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 
-
-scala> import scala.reflect.runtime.universe._
-import scala.reflect.runtime.universe._
-
-scala> class A { def foo(x: Int*) = 1 }
-defined class A
-
-scala> val sig = typeOf[A] member newTermName("foo") typeSignature
-warning: there were 1 feature warnings; re-run with -feature for details
-sig: reflect.runtime.universe.Type = (x: <?>)scala.Int
-
-scala> val x = sig.asInstanceOf[MethodType].params.head
-x: reflect.runtime.universe.Symbol = value x
-
-scala> println(x.typeSignature)
-scala.Int*
-
-scala> 
diff --git a/test/files/run/reflection-magicsymbols.scala b/test/files/run/reflection-magicsymbols.scala
deleted file mode 100644
index a40845d6ac..0000000000
--- a/test/files/run/reflection-magicsymbols.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-import scala.tools.partest.ReplTest
-
-object Test extends ReplTest {
-  def code = """
-    |import scala.reflect.runtime.universe._
-    |class A { def foo(x: Int*) = 1 }
-    |val sig = typeOf[A] member newTermName("foo") typeSignature
-    |val x = sig.asInstanceOf[MethodType].params.head
-    |println(x.typeSignature)
-    |""".stripMargin
-}
diff --git a/test/files/run/t6086-repl.check b/test/files/run/t6086-repl.check
new file mode 100644
index 0000000000..f868aa18d0
--- /dev/null
+++ b/test/files/run/t6086-repl.check
@@ -0,0 +1,12 @@
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 
+
+scala> case class X(s: String)
+defined class X
+
+scala> scala.reflect.runtime.universe.typeOf[X]
+res0: reflect.runtime.universe.Type = X
+
+scala> 
diff --git a/test/files/run/t6086-repl.scala b/test/files/run/t6086-repl.scala
new file mode 100644
index 0000000000..87f94ec9f6
--- /dev/null
+++ b/test/files/run/t6086-repl.scala
@@ -0,0 +1,8 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  def code = """
+    |case class X(s: String)
+    |scala.reflect.runtime.universe.typeOf[X]
+    |""".stripMargin
+}
diff --git a/test/files/run/t6086-vanilla.check b/test/files/run/t6086-vanilla.check
new file mode 100644
index 0000000000..fd66be08d0
--- /dev/null
+++ b/test/files/run/t6086-vanilla.check
@@ -0,0 +1 @@
+X
diff --git a/test/files/run/t6086-vanilla.scala b/test/files/run/t6086-vanilla.scala
new file mode 100644
index 0000000000..b4de581ad5
--- /dev/null
+++ b/test/files/run/t6086-vanilla.scala
@@ -0,0 +1,6 @@
+case class X(s: String)
+
+object Test extends App {
+  import scala.reflect.runtime.universe._
+  println(typeOf[X])
+}
+\ No newline at end of file