6 files changed, 45 insertions, 0 deletions
diff --git a/test/files/run/t7570a.check b/test/files/run/t7570a.check
new file mode 100644
index 0000000000..3cc58df837
--- /dev/null
+++ b/test/files/run/t7570a.check
@@ -0,0 +1 @@
+C
diff --git a/test/files/run/t7570a.scala b/test/files/run/t7570a.scala
new file mode 100644
index 0000000000..b8b4ddeaf2
--- /dev/null
+++ b/test/files/run/t7570a.scala
@@ -0,0 +1,11 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+import definitions._
+import Flag._
+
+object Test extends App {
+  val tb = cm.mkToolBox()
+  val csym = tb.define(q"""class C { override def toString = "C" }""")
+  println(tb.eval(q"new $csym"))
+}
+\ No newline at end of file
diff --git a/test/files/run/t7570b.check b/test/files/run/t7570b.check
new file mode 100644
index 0000000000..0c28247025
--- /dev/null
+++ b/test/files/run/t7570b.check
@@ -0,0 +1 @@
+compilation failed: reflective toolbox has failed: cannot have free terms in a top-level definition
diff --git a/test/files/run/t7570b.scala b/test/files/run/t7570b.scala
new file mode 100644
index 0000000000..f1db193186
--- /dev/null
+++ b/test/files/run/t7570b.scala
@@ -0,0 +1,17 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.{ToolBox, ToolBoxError}
+import definitions._
+import Flag._
+
+object Test extends App {
+  val tb = cm.mkToolBox()
+  val msg = build.newFreeTerm("msg", "C")
+  build.setTypeSignature(msg, typeOf[String])
+  try {
+    val csym = tb.define(q"""class C { override def toString = $msg }""")
+    println(tb.eval(q"new $csym"))
+  } catch {
+    case ToolBoxError(message, _) => println(s"compilation failed: $message")
+  }
+}
+\ No newline at end of file
diff --git a/test/files/run/t7570c.check b/test/files/run/t7570c.check
new file mode 100644
index 0000000000..61e659d9e0
--- /dev/null
+++ b/test/files/run/t7570c.check
@@ -0,0 +1,2 @@
+(class C,true,false,false)
+(object D,false,true,false)
diff --git a/test/files/run/t7570c.scala b/test/files/run/t7570c.scala
new file mode 100644
index 0000000000..a5bdbffe18
--- /dev/null
+++ b/test/files/run/t7570c.scala
@@ -0,0 +1,13 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.{ToolBox, ToolBoxError}
+import definitions._
+import Flag._
+
+object Test extends App {
+  val tb = cm.mkToolBox()
+  val csym = tb.define(q"""class C { override def toString = "C" }""")
+  println((csym, csym.isClass, csym.isModule, csym.isModuleClass))
+  val dsym = tb.define(q"""object D { override def toString = "D" }""".asInstanceOf[ModuleDef])
+  println((dsym, dsym.isClass, dsym.isModule, dsym.isModuleClass))
+}
+\ No newline at end of file