Factor out common macro suspend logic

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/Interpreter.scala

@@ -166,10 +166,8 @@ class Interpreter(pos: SrcPos, classLoader: ClassLoader)(using Context):
           (inst, inst.getClass)
         }
       catch
-        case MissingClassDefinedInCurrentRun(sym)  if ctx.compilationUnit.isSuspendable =>
-          if (ctx.settings.XprintSuspension.value)
-            report.echo(i"suspension triggered by a dependency on $sym", pos)
-          ctx.compilationUnit.suspend() // this throws a SuspendException
+        case MissingClassDefinedInCurrentRun(sym) =>
+          suspendOnMissing(sym, pos)
 
     val name = fn.name.asTermName
     val method = getMethod(clazz, name, paramsSig(fn))
@@ -214,23 +212,19 @@ class Interpreter(pos: SrcPos, classLoader: ClassLoader)(using Context):
 
   private def loadClass(name: String): Class[?] =
     try classLoader.loadClass(name)
-    catch {
-      case MissingClassDefinedInCurrentRun(sym) if ctx.compilationUnit.isSuspendable =>
-        if (ctx.settings.XprintSuspension.value)
-          report.echo(i"suspension triggered by a dependency on $sym", pos)
-        ctx.compilationUnit.suspend() // this throws a SuspendException
-    }
+    catch
+      case MissingClassDefinedInCurrentRun(sym) =>
+        suspendOnMissing(sym, pos)
+
 
   private def getMethod(clazz: Class[?], name: Name, paramClasses: List[Class[?]]): JLRMethod =
     try clazz.getMethod(name.toString, paramClasses: _*)
     catch {
       case _: NoSuchMethodException =>
         val msg = em"Could not find method ${clazz.getCanonicalName}.$name with parameters ($paramClasses%, %)"
         throw new StopInterpretation(msg, pos)
-      case MissingClassDefinedInCurrentRun(sym) if ctx.compilationUnit.isSuspendable =>
-          if (ctx.settings.XprintSuspension.value)
-            report.echo(i"suspension triggered by a dependency on $sym", pos)
-          ctx.compilationUnit.suspend() // this throws a SuspendException
+      case MissingClassDefinedInCurrentRun(sym) =>
+        suspendOnMissing(sym, pos)
     }
 
   private def stopIfRuntimeException[T](thunk: => T, method: JLRMethod): T =
@@ -248,10 +242,8 @@ class Interpreter(pos: SrcPos, classLoader: ClassLoader)(using Context):
         ex.getTargetException match {
           case ex: scala.quoted.runtime.StopMacroExpansion =>
             throw ex
-          case MissingClassDefinedInCurrentRun(sym) if ctx.compilationUnit.isSuspendable =>
-            if (ctx.settings.XprintSuspension.value)
-              report.echo(i"suspension triggered by a dependency on $sym", pos)
-            ctx.compilationUnit.suspend() // this throws a SuspendException
+          case MissingClassDefinedInCurrentRun(sym) =>
+            suspendOnMissing(sym, pos)
           case targetException =>
             val sw = new StringWriter()
             sw.write("Exception occurred while executing macro expansion.\n")
@@ -364,3 +356,8 @@ object Interpreter:
         case _ => None
     }
   }
+
+  def suspendOnMissing(sym: Symbol, pos: SrcPos)(using Context): Nothing =
+    if ctx.settings.XprintSuspension.value then
+      report.echo(i"suspension triggered by a dependency on $sym", pos)
+    ctx.compilationUnit.suspend() // this throws a SuspendException

compiler/src/dotty/tools/dotc/transform/MacroAnnotations.scala

@@ -68,10 +68,8 @@ class MacroAnnotations(thisPhase: DenotTransformer):
                     if !ctx.reporter.hasErrors then
                       report.error("Macro expansion was aborted by the macro without any errors reported. Macros should issue errors to end-users to facilitate debugging when aborting a macro expansion.", annot.tree)
                     List(tree)
-                  case Interpreter.MissingClassDefinedInCurrentRun(sym) if ctx.compilationUnit.isSuspendable =>
-                    if (ctx.settings.XprintSuspension.value)
-                      report.echo(i"suspension triggered by a dependency on $sym", annot.tree)
-                    ctx.compilationUnit.suspend() // this throws a SuspendException
+                  case Interpreter.MissingClassDefinedInCurrentRun(sym) =>
+                    Interpreter.suspendOnMissing(sym, annot.tree)
                   case NonFatal(ex) =>
                     val stack0 = ex.getStackTrace.takeWhile(_.getClassName != "dotty.tools.dotc.transform.MacroAnnotations")
                     val stack = stack0.take(1 + stack0.lastIndexWhere(_.getMethodName == "transform"))