macro impls can now return subtypes of c.Tree

10229316db allowed macro impls to take and return values of type c.Tree
in addition to the usual c.Expr. However it didn't take into account that
it is often useful to return subtypes of trees (e.g. with quasiquotes
that expand into expressions typed as precisely as possible). This patch
fixes that oversight.

2 files changed, 20 insertions, 0 deletions

diff --git a/test/files/neg/macro-quasiquotes/Macros_1.scala b/test/files/neg/macro-quasiquotes/Macros_1.scala
new file mode 100644
index 0000000000..17c1034720
--- /dev/null
+++ b/test/files/neg/macro-quasiquotes/Macros_1.scala
@@ -0,0 +1,15 @@
+import language.experimental.macros
+import scala.reflect.macros.Macro
+
+trait Impls extends Macro {
+  import c.universe._
+  def impl1(x: Expr[Int]) = q"println(x)"
+  def impl2(x: Tree) = q"println(x)"
+  def impl3(x: Block) = q"println(x)"
+}
+
+object Macros {
+  def m1(x: Int) = macro Impls.impl1
+  def m2(x: Int) = macro Impls.impl2
+  def m3(x: Int) = macro Impls.impl3
+}
\ No newline at end of file
diff --git a/test/files/neg/macro-quasiquotes/Test_2.scala b/test/files/neg/macro-quasiquotes/Test_2.scala
new file mode 100644
index 0000000000..c7b8948d79
--- /dev/null
+++ b/test/files/neg/macro-quasiquotes/Test_2.scala
@@ -0,0 +1,5 @@
+object Test extends App {
+  Macros.m1
+  Macros.m2
+  Macros.m3
+}