Merge pull request #12376 from dotty-staging/fix-12361

nicolasstucki · web-flow · commit 66b315d8cf02 · 2021-05-09T10:38:11.000+02:00
Fix #12361: Handle MacroTree from ill-formed code
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2724,6 +2724,7 @@ class Typer extends Namer
           case tree: untpd.Quote => typedQuote(tree, pt)
           case tree: untpd.Splice => typedSplice(tree, pt)
           case tree: untpd.TypSplice => typedTypSplice(tree, pt)
+          case tree: untpd.MacroTree => report.error("Unexpected macro", tree.srcPos); tpd.nullLiteral  // ill-formed code may reach here
           case _ => typedUnadapted(desugar(tree), pt, locked)
         }
 
diff --git a/tests/fuzzy/07b22d72e723607d8f0dfef3f4c8fb8076387a7b.scala b/tests/fuzzy/07b22d72e723607d8f0dfef3f4c8fb8076387a7b.scala
@@ -0,0 +1 @@
+val a = macro ??? // error
diff --git a/tests/neg/i12361.scala b/tests/neg/i12361.scala
@@ -0,0 +1,3 @@
+object Test {
+    foo = macro Impls . foo [ U ] +=    // error  // error
+}

Original file line number	Diff line number	Diff line change
`@@ -2724,6 +2724,7 @@ class Typer extends Namer`
`2724`	`2724`	`case tree: untpd.Quote => typedQuote(tree, pt)`
`2725`	`2725`	`case tree: untpd.Splice => typedSplice(tree, pt)`
`2726`	`2726`	`case tree: untpd.TypSplice => typedTypSplice(tree, pt)`
	`2727`	`+ case tree: untpd.MacroTree => report.error("Unexpected macro", tree.srcPos); tpd.nullLiteral // ill-formed code may reach here`
`2727`	`2728`	`case _ => typedUnadapted(desugar(tree), pt, locked)`
`2728`	`2729`	`}`
`2729`	`2730`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+object Test {`
	`2`	`+ foo = macro Impls . foo [ U ] += // error // error`
	`3`	`+}`