tidy up

Author: bertlebee

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

@@ -16,7 +16,6 @@ import core.Decorators._
 import config.{SourceVersion, Feature}
 import StdNames.nme
 import scala.annotation.internal.sharable
-import scala.util.control.ControlThrowable
 import transform.MacroAnnotations
 
 class CompilationUnit protected (val source: SourceFile) {

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

@@ -3,7 +3,7 @@ package dotty.tools.dotc
 import dotty.tools.FatalError
 import config.CompilerCommand
 import core.Comments.{ContextDoc, ContextDocstrings}
-import core.Contexts._, core.ContextOps._
+import core.Contexts._
 import util.Implosion
 import core.{MacroClassLoader, TypeError}
 import dotty.tools.dotc.ast.Positioned

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

@@ -179,9 +179,12 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
       compileSources(sources)
     catch
       case NonFatal(ex) =>
-        if units.nonEmpty then report.echo(i"exception occurred while compiling $units%, %")
-        else report.echo(s"exception occurred while compiling ${files.map(_.name).mkString(", ")}")
-        throw ex
+        try
+          if units.nonEmpty then ctx.lateImplode(i"exception occurred while compiling $units%, %")
+          else ctx.lateImplode(s"exception occurred while compiling ${files.map(_.name).mkString(", ")}")
+        catch 
+          case _: Implosion => 
+          
       case _ : Implosion => 
         // All handling related to the Implosion is done during creation, so we can swallow this
 

compiler/src/dotty/tools/dotc/cc/CaptureSet.scala

@@ -3,7 +3,7 @@ package dotc
 package cc
 
 import core.*
-import Types.*, Symbols.*, Flags.*, Contexts.*, ContextOps.*, Decorators.*
+import Types.*, Symbols.*, Flags.*, Contexts.*, Decorators.*
 import config.Printers.capt
 import Annotations.Annotation
 import annotation.threadUnsafe

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

@@ -5,12 +5,9 @@ import Contexts._, Symbols._, Types._, Flags._
 import Denotations._, SymDenotations._
 import Names.Name, StdNames.nme
 import ast.untpd
-import util.*
-import scala.util.control.NonFatal
 
 /** Extension methods for contexts where we want to keep the ctx.<methodName> syntax */
 object ContextOps:
-  
   extension (ctx: Context)
 
     /** Enter symbol into current class, if current class is owner of current context,

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

@@ -482,6 +482,9 @@ object Contexts {
     def lateImplode(cause: Throwable): Nothing = 
       Implosion(Exception("Context was thrown away, this crash report may not be accurate", (cause)))(using ctx)
 
+    def lateImplode(msg: Any): Nothing = 
+      lateImplode(AssertionError(msg))
+
     final def withOwner(owner: Symbol): Context =
       if (owner ne this.owner) fresh.setOwner(owner) else this
 

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

@@ -21,8 +21,7 @@ import typer.ImportInfo.withRootImports
 import ast.{tpd, untpd}
 import scala.annotation.internal.sharable
 import scala.util.control.NonFatal
-import dotty.tools.dotc.core.ContextOps.*
-import dotty.tools.dotc.CompilationUnit.SuspendException
+
 
 
 object Phases {

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

@@ -18,8 +18,8 @@ object TypeApplications {
   type TypeParamInfo = ParamInfo.Of[TypeName]
 
   /** Assert type is not a TypeBounds instance and return it unchanged */
-  def noBounds(tp: Type)(using Context): Type = tp match {
-    case tp: TypeBounds => ctx.implode("no TypeBounds allowed")
+  def noBounds(tp: Type): Type = tp match {
+    case tp: TypeBounds => throw new AssertionError("no TypeBounds allowed")
     case _ => tp
   }
 

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

@@ -73,7 +73,7 @@ object report:
     error(msg.toMessage, pos)
 
   def error(msg: => String)(using Context): Unit =
-    error(msg, NoSourcePosition) //why default to NoSourcePosition? Surely the caller should be encouraged to at least think about the position and specify NoSourcePosition if no sane position exists
+    error(msg, NoSourcePosition)
 
   def error(ex: TypeError, pos: SrcPos)(using Context): Unit =
     val fullPos = addInlineds(pos)

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

@@ -34,7 +34,6 @@ import ContextFunctionResults._
 import ExplicitOuter._
 import core.Mode
 import util.Property
-
 import reporting._
 
 class Erasure extends Phase with DenotTransformer {