2 files changed, 58 insertions, 0 deletions
diff --git a/test/files/run/macro-expand-override/Impls_1.scala b/test/files/run/macro-expand-override/Impls_1.scala
new file mode 100644
index 0000000000..0b127f5a59
--- /dev/null
+++ b/test/files/run/macro-expand-override/Impls_1.scala
@@ -0,0 +1,15 @@
+import scala.reflect.makro.{Context => Ctx}
+
+object Impls {
+  def impl(c: Ctx)(tag: String, x: c.Expr[_]) = {
+    import c.{prefix => prefix}
+    import c.mirror._
+    val body = Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(Literal(Constant(tag)), Literal(Constant(prefix.toString)), x.tree))
+    Expr[Unit](body)
+  }
+
+  def fooBString(c: Ctx)(x: c.Expr[_]) = impl(c)("fooBString", x)
+  def fooBInt(c: Ctx)(x: c.Expr[_]) = impl(c)("fooBInt", x)
+  def fooDInt(c: Ctx)(x: c.Expr[_]) = impl(c)("fooDInt", x)
+  def fooZString(c: Ctx)(x: c.Expr[_]) = impl(c)("fooZString", x)
+}
diff --git a/test/files/run/macro-expand-override/Macros_Test_2.scala b/test/files/run/macro-expand-override/Macros_Test_2.scala
new file mode 100644
index 0000000000..f162773c95
--- /dev/null
+++ b/test/files/run/macro-expand-override/Macros_Test_2.scala
@@ -0,0 +1,43 @@
+class B {
+  def foo(x: String) = macro Impls.fooBString
+  def foo(x: Int) = macro Impls.fooBInt
+  def foo(x: Boolean) = println("fooBBoolean")
+}
+
+class D extends B {
+  //override def foo(x: String) = println("fooDString") => method cannot override a macro
+  override def foo(x: Int) = macro Impls.fooDInt
+}
+
+class Z extends D {
+  override def foo(x: String) = macro Impls.fooZString
+  override def foo(x: Boolean) = println("fooZBoolean")
+}
+
+object Test extends App {
+
+  val dd: D = new D()
+  dd.foo("42")
+  dd.foo(42)
+  dd.foo(true)
+
+  val db: B = new D()
+  db.foo("42")
+  db.foo(42)
+  db.foo(true)
+
+  val zz: Z = new Z()
+  zz.foo("42")
+  zz.foo(42)
+  zz.foo(true)
+
+  val zd: D = new Z()
+  zd.foo("42")
+  zd.foo(42)
+  zd.foo(true)
+
+  val zb: B = new Z()
+  zb.foo("42")
+  zb.foo(42)
+  zb.foo(true)
+}
+\ No newline at end of file