Move errorsToBeReported variable to ContextBase

context.run is not always defined (e.g. for doctool).

Author: odersky

compiler/src/dotty/tools/dotc/Run.scala

@@ -144,17 +144,6 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
   /** Actions that need to be performed at the end of the current compilation run */
   private var finalizeActions = mutable.ListBuffer[() => Unit]()
 
-  /** A variable that records that some error was reported in a globally committable context.
-   *  The error will not necessarlily be emitted, since it could still be that
-   *  the enclosing context will be aborted. The variable is used as a smoke test
-   *  to turn off assertions that might be wrong if the program is erroneous. To
-   *  just test for `ctx.reporter.errorsReported` is not always enough, since it
-   *  could be that the context in which the assertion is tested is a completer context
-   *  that's different from the context where the error was reported. See i13218.scala
-   *  for a test.
-   */
-  var errorsToBeReported = false
-
   def compile(files: List[AbstractFile]): Unit =
     try
       val sources = files.map(runContext.getSource(_))

compiler/src/dotty/tools/dotc/core/Contexts.scala

@@ -929,6 +929,17 @@ object Contexts {
     /** Flag to suppress inlining, set after overflow */
     private[dotc] var stopInlining: Boolean = false
 
+    /** A variable that records that some error was reported in a globally committable context.
+     *  The error will not necessarlily be emitted, since it could still be that
+     *  the enclosing context will be aborted. The variable is used as a smoke test
+     *  to turn off assertions that might be wrong if the program is erroneous. To
+     *  just test for `ctx.reporter.errorsReported` is not always enough, since it
+     *  could be that the context in which the assertion is tested is a completer context
+     *  that's different from the context where the error was reported. See i13218.scala
+     *  for a test.
+     */
+    private[dotc] var errorsToBeReported = false
+
     // Reporters state
     private[dotc] var indent: Int = 0
 
@@ -958,6 +969,7 @@ object Contexts {
       uniqueNamedTypes.clear()
       emptyTypeBounds = null
       emptyWildcardBounds = null
+      errorsToBeReported = false
       errorTypeMsg.clear()
       sources.clear()
       files.clear()

compiler/src/dotty/tools/dotc/reporting/Reporter.scala

@@ -158,7 +158,7 @@ abstract class Reporter extends interfaces.ReporterResult {
           errors = dia :: errors
           _errorCount += 1
           if ctx.typerState.isGlobalCommittable then
-            ctx.run.errorsToBeReported = true
+            ctx.base.errorsToBeReported = true
         case dia: Info => // nothing to do here
         // match error if d is something else
 

compiler/src/dotty/tools/dotc/util/Attachment.scala

@@ -117,7 +117,7 @@ object Attachment {
     }
 
     final def pushAttachment[V](key: Key[V], value: V)(using ctx: Context): Unit = {
-      assert(!hasAttachment(key) || ctx.run.errorsToBeReported, s"duplicate attachment for key $key")
+      assert(!hasAttachment(key) || ctx.base.errorsToBeReported, s"duplicate attachment for key $key")
       next = new Link(key, value, next)
     }