Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 17 insertions, 0 deletions

diff --git a/test/pending/run/reify_closures11.scala b/test/pending/run/reify_closures11.scala
new file mode 100644
index 0000000000..2c4177b8f2
--- /dev/null
+++ b/test/pending/run/reify_closures11.scala
@@ -0,0 +1,17 @@
+import scala.reflect.Code._
+import scala.tools.nsc.reporters._
+import scala.tools.nsc.Settings
+import reflect.runtime.Mirror.ToolBox
+
+object Test extends App {
+  def fun() = {
+    def z() = 2
+    lift{z}
+  }
+
+  val reporter = new ConsoleReporter(new Settings)
+  val toolbox = new ToolBox(reporter)
+  val dyn = toolbox.runExpr(fun().tree)
+  val foo = dyn.asInstanceOf[Int]
+  println(foo)
+}