Merge commit 'refs/pull/375/head' into develop

2 files changed, 19 insertions, 0 deletions

diff --git a/test/files/run/macro-invalidret-nontypeable/Impls_Macros_1.scala b/test/files/run/macro-invalidret-nontypeable/Impls_Macros_1.scala
new file mode 100644
index 0000000000..f3a0476a35
--- /dev/null
+++ b/test/files/run/macro-invalidret-nontypeable/Impls_Macros_1.scala
@@ -0,0 +1,13 @@
+import scala.reflect.makro.{Context => Ctx}
+
+object Impls {
+  def foo(c: Ctx) = {
+    import c.mirror._
+    val body = Ident("IDoNotExist")
+    Expr[Int](body)
+  }
+}
+
+object Macros {
+  def foo = macro Impls.foo
+}
diff --git a/test/files/run/macro-invalidret-nontypeable/Test_2.scala b/test/files/run/macro-invalidret-nontypeable/Test_2.scala
new file mode 100644
index 0000000000..f389231ca6
--- /dev/null
+++ b/test/files/run/macro-invalidret-nontypeable/Test_2.scala
@@ -0,0 +1,6 @@
+object Test extends App {
+  import scala.reflect.mirror._
+  val tree = Select(Ident("Macros"), newTermName("foo"))
+  try tree.eval
+  catch { case ex: Throwable =>  println(ex.getMessage) }
+}
\ No newline at end of file