Don't typecheck Scala2 macro calls in retyping mode

odersky · odersky · commit 2df18bf17f4d · 2021-05-21T18:09:39.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/typer/ReTyper.scala b/compiler/src/dotty/tools/dotc/typer/ReTyper.scala
@@ -134,4 +134,5 @@ class ReTyper extends Typer with ReChecking {
   override protected def addAccessorDefs(cls: Symbol, body: List[Tree])(using Context): List[Tree] = body
   override protected def checkEqualityEvidence(tree: tpd.Tree, pt: Type)(using Context): Unit = ()
   override protected def matchingApply(methType: MethodOrPoly, pt: FunProto)(using Context): Boolean = true
+  override protected def typedScala2MacroBody(call: untpd.Tree)(using Context): Tree = promote(call)
 }
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3900,7 +3900,7 @@ class Typer extends Namer
         report.warning(PureExpressionInStatementPosition(original, exprOwner), original.srcPos)
 
   /** Types the body Scala 2 macro declaration `def f = macro <body>` */
-  private def typedScala2MacroBody(call: untpd.Tree)(using Context): Tree =
+  protected def typedScala2MacroBody(call: untpd.Tree)(using Context): Tree =
     // TODO check that call is to a method with valid signature
     def typedPrefix(tree: untpd.RefTree)(splice: Context ?=> Tree => Tree)(using Context): Tree = {
       tryAlternatively {

Original file line number	Diff line number	Diff line change
`@@ -134,4 +134,5 @@ class ReTyper extends Typer with ReChecking {`
`134`	`134`	`override protected def addAccessorDefs(cls: Symbol, body: List[Tree])(using Context): List[Tree] = body`
`135`	`135`	`override protected def checkEqualityEvidence(tree: tpd.Tree, pt: Type)(using Context): Unit = ()`
`136`	`136`	`override protected def matchingApply(methType: MethodOrPoly, pt: FunProto)(using Context): Boolean = true`
	`137`	`+ override protected def typedScala2MacroBody(call: untpd.Tree)(using Context): Tree = promote(call)`
`137`	`138`	`}`