Merge branch 'master' into topic/inline

Conflicts:
	src/compiler/scala/tools/nsc/Global.scala
	test/files/run/programmatic-main.check

1 files changed, 16 insertions, 0 deletions

diff --git a/test/files/run/t5334_2.scala b/test/files/run/t5334_2.scala
new file mode 100644
index 0000000000..26f0778400
--- /dev/null
+++ b/test/files/run/t5334_2.scala
@@ -0,0 +1,16 @@
+import scala.tools.nsc.reporters._
+import scala.tools.nsc.Settings
+import reflect.runtime.Mirror.ToolBox
+
+object Test extends App {
+  val code = scala.reflect.Code.lift{
+    class C { override def toString() = "C" }
+    List((new C, new C))
+  };
+
+  val reporter = new ConsoleReporter(new Settings)
+  val toolbox = new ToolBox(reporter)
+  val ttree = toolbox.typeCheck(code.tree)
+  println(ttree.tpe)
+  println(toolbox.runExpr(ttree))
+}