log, abort

Author: magarciaEPFL

src/dotty/tools/dotc/backend/jvm/BCodeBodyBuilder.scala

@@ -757,12 +757,12 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
                   val qualSym = findHostClass(qual.tpe, sym)
                   if (qualSym == ArrayClass) {
                     targetTypeKind = tpeTK(qual)
-                    log(s"Stored target type kind for ${sym.fullName} as $targetTypeKind")
+                    ctx.log(s"Stored target type kind for ${sym.fullName} as $targetTypeKind")
                   }
                   else {
                     hostClass = qualSym
                     if (qual.tpe.typeSymbol != qualSym) {
-                      log(s"Precisified host class for $sym from ${qual.tpe.typeSymbol.fullName} to ${qualSym.fullName}")
+                      ctx.log(s"Precisified host class for $sym from ${qual.tpe.typeSymbol.fullName} to ${qualSym.fullName}")
                     }
                   }
 
@@ -948,8 +948,8 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
       val module = (
         if (!tree.symbol is Flags.PackageClass) tree.symbol
         else tree.symbol.info.member(nme.PACKAGE) match {
-          case NoSymbol => abort(s"SI-5604: Cannot use package as value: $tree")
-          case s        => abort(s"SI-5604: found package class where package object expected: $tree")
+          case NoDenotation => abort(s"SI-5604: Cannot use package as value: $tree")
+          case s            => abort(s"SI-5604: found package class where package object expected: $tree")
         }
       )
       lineNumber(tree)

src/dotty/tools/dotc/backend/jvm/BCodeHelpers.scala

@@ -209,23 +209,23 @@ abstract class BCodeHelpers extends BCodeTypes with BytecodeWriters {
   /*
    * must-single-thread
    */
-  def initBytecodeWriter(entryPoints: List[Symbol]): BytecodeWriter = {
+  def initBytecodeWriter(entryPoints: List[Symbol])(implicit ctx: core.Contexts.Context): BytecodeWriter = {
     settings.outputDirs.getSingleOutput match {
       case Some(f) if f hasExtension "jar" =>
         // If no main class was specified, see if there's only one
         // entry point among the classes going into the jar.
         if (settings.mainClass.isDefault) {
           entryPoints map (_.fullName('.')) match {
             case Nil      =>
-              log("No Main-Class designated or discovered.")
+              ctx.log("No Main-Class designated or discovered.")
             case name :: Nil =>
-              log(s"Unique entry point: setting Main-Class to $name")
+              ctx.log(s"Unique entry point: setting Main-Class to $name")
               settings.mainClass.value = name
             case names =>
-              log(s"No Main-Class due to multiple entry points:\n  ${names.mkString("\n  ")}")
+              ctx.log(s"No Main-Class due to multiple entry points:\n  ${names.mkString("\n  ")}")
           }
         }
-        else log(s"Main-Class was specified: ${settings.mainClass.value}")
+        else ctx.log(s"Main-Class was specified: ${settings.mainClass.value}")
 
         new DirectToJarfileWriter(f.file)
 

src/dotty/tools/dotc/backend/jvm/BCodeIdiomatic.scala

@@ -691,4 +691,10 @@ abstract class BCodeIdiomatic extends BCodeGlue {
       }
     }
   }
+
+  def abort(msg: => AnyRef)(implicit ctx: core.Contexts.Context): Nothing = {
+    ctx.error(msg)
+    throw new FatalError(msg)
+  }
+
 }

src/dotty/tools/dotc/backend/jvm/BCodeSkelBuilder.scala

@@ -83,10 +83,6 @@ abstract class BCodeSkelBuilder extends BCodeHelpers {
 
     def tpeTK(tree: Tree): BType = { toTypeKind(tree.tpe) }
 
-    def log(msg: => AnyRef) {
-      global synchronized { global.log(msg) }
-    }
-
     override def getCurrentCUnit(): CompilationUnit = { cunit }
 
     /* ---------------- helper utils for generating classes and fiels ---------------- */
@@ -188,7 +184,7 @@ abstract class BCodeSkelBuilder extends BCodeHelpers {
               exitingPickler { !(lmoc.name.toString contains '$') && lmoc.hasModuleFlag && !(lmoc is Flags.ImplClass) && !lmoc.isNestedClass }
             }
             if (isCandidateForForwarders) {
-              log(s"Adding static forwarders from '$claszSymbol' to implementations in '$lmoc'")
+              ctx.log(s"Adding static forwarders from '$claszSymbol' to implementations in '$lmoc'")
               addForwarders(isRemote(claszSymbol), cnode, thisName, lmoc.moduleClass)
             }
           }