Improve error handling of missuses of AbortExpansion

scala · Apr 13, 2021 · 4d28db1 · 4d28db1
1 parent 2705092
commit 4d28db1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/compiler/src/dotty/tools/dotc/transform/Splicer.scala b/compiler/src/dotty/tools/dotc/transform/Splicer.scala
@@ -63,7 +63,9 @@ object Splicer {
       catch {
         case ex: CompilationUnit.SuspendException =>
           throw ex
-        case ex: scala.quoted.runtime.AbortExpansion if ctx.reporter.hasErrors =>
+        case ex: scala.quoted.runtime.AbortExpansion =>
+          if !ctx.reporter.hasErrors then
+            report.error("An AbortExpansion was thrown without any errors reported while expanding a macro. This macro has a bug.", splicePos)
           // errors have been emitted
           EmptyTree
         case ex: StopInterpretation =>

diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
@@ -51,7 +51,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
      *  Emits an error and throws if the expression does not represent a value or possibly contains side effects.
      *  Otherwise returns the value.
      */
-    @deprecated("Use valueOrThrow", "3.0.0-RC3")
+    @deprecated("Use valueOrThrow", "3.1.0")
     def valueOrError(using FromExpr[T]): T = valueOrAbort
 
     /** Return the value of this expression.

diff --git a/library/src/scala/quoted/runtime/StopMacroExpansion.scala b/library/src/scala/quoted/runtime/StopMacroExpansion.scala
@@ -2,4 +2,4 @@ package scala.quoted.runtime
 
 /** Throwable used to stop the expansion of a macro after an error was reported */
 @deprecated("Use AbortExpansion", "3.0.0-RC3")
-class StopMacroExpansion extends Throwable
+class StopMacroExpansion extends AbortExpansion
diff --git a/tests/neg-macros/ill-abort.check b/tests/neg-macros/ill-abort.check
@@ -0,0 +1,6 @@
+
+-- Error: tests/neg-macros/ill-abort/quoted_2.scala:1:15 ---------------------------------------------------------------
+1 |def test = fail() // error
+  |           ^^^^^^
+  |           An AbortExpansion was thrown without any errors reported while expanding a macro. This macro has a bug.
+  | This location contains code that was inlined from quoted_1.scala:3
diff --git a/tests/neg-macros/ill-abort/quoted_1.scala b/tests/neg-macros/ill-abort/quoted_1.scala
@@ -0,0 +1,7 @@
+import scala.quoted.*
+
+inline def fail(): Unit = ${ impl }
+
+private def impl(using Quotes) : Expr[Unit] =
+  // should never be done without reporting error before (see docs)
+  throw new scala.quoted.runtime.AbortExpansion
diff --git a/tests/neg-macros/ill-abort/quoted_2.scala b/tests/neg-macros/ill-abort/quoted_2.scala
@@ -0,0 +1 @@
+def test = fail() // error