apply review suggestions

Author: jchyb

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

@@ -41,6 +41,7 @@ class Driver {
           report.error(ex.getMessage.nn) // signals that we should fail compilation.
         case ex: Throwable if ctx.usedBestEffortTasty =>
           report.bestEffortError(ex, "Some best-effort tasty files were not able to be read.")
+          throw ex
         case ex: TypeError if !runOrNull.enrichedErrorMessage =>
           println(runOrNull.enrichErrorMessage(s"${ex.toMessage} while compiling ${files.map(_.path).mkString(", ")}"))
           throw ex

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

@@ -919,12 +919,12 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
       else cpy.PackageDef(tree)(pid, slicedStats) :: Nil
     case tdef: TypeDef =>
       val sym = tdef.symbol
-      if !ctx.isBestEffort then assert(sym.isClass)
+      assert(sym.isClass || ctx.tolerateErrorsForBestEffort)
       if (cls == sym || cls == sym.linkedClass) tdef :: Nil
       else Nil
     case vdef: ValDef =>
       val sym = vdef.symbol
-      if !ctx.isBestEffort then assert(sym.is(Module))
+      assert(sym.is(Module) || ctx.tolerateErrorsForBestEffort)
       if (cls == sym.companionClass || cls == sym.moduleClass) vdef :: Nil
       else Nil
     case tree =>

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

@@ -435,7 +435,6 @@ class TastyLoader(val tastyFile: AbstractFile) extends SymbolLoader {
       val (classRoot, moduleRoot) = rootDenots(root.asClass)
       if (!isBestEffortTasty || ctx.withBestEffortTasty) then
         val tastyBytes = tastyFile.toByteArray
-        val unpickler = new tasty.DottyUnpickler(tastyFile, tastyBytes, isBestEffortTasty = isBestEffortTasty)
         unpickler.enter(roots = Set(classRoot, moduleRoot, moduleRoot.sourceModule))(using ctx.withSource(util.NoSource))
         if mayLoadTreesFromTasty || isBestEffortTasty then
           classRoot.classSymbol.rootTreeOrProvider = unpickler
@@ -446,7 +445,7 @@ class TastyLoader(val tastyFile: AbstractFile) extends SymbolLoader {
         else
           checkTastyUUID()
       else
-        report.error(em"Best Effort TASTy $tastyFile file could not be read.")
+        report.error(em"Cannot read Best Effort TASTy $tastyFile without the ${ctx.settings.YwithBestEffortTasty.name} option")
 
   private def handleUnpicklingExceptions[T](thunk: =>T): T =
     try thunk

compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

@@ -73,7 +73,7 @@ class TreePickler(pickler: TastyPickler, attributes: Attributes) {
    *  For regular non best-effort compilation (without best-effort and without using .betasty on classpath),
    *  this will always return true.
    */
-  private inline def passesConditionForErroringBestEffortCode(condition: Boolean)(using Context): Boolean =
+  private inline def passesConditionForErroringBestEffortCode(condition: => Boolean)(using Context): Boolean =
     ((!ctx.isBestEffort && ctx.reporter.errorsReported) || ctx.usedBestEffortTasty) || condition
 
   def addrOfSym(sym: Symbol): Option[Addr] =

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -455,7 +455,7 @@ class TreeUnpickler(reader: TastyReader,
         result
       }
 
-      def readSimpleType(): Type = tag match {
+      def readSimpleType(): Type = (tag: @switch) match {
         case TYPEREFdirect | TERMREFdirect =>
           NamedType(NoPrefix, readSymRef())
         case TYPEREFsymbol | TERMREFsymbol =>
@@ -497,8 +497,9 @@ class TreeUnpickler(reader: TastyReader,
           typeAtAddr.getOrElseUpdate(ref, forkAt(ref).readType())
         case BYNAMEtype =>
           ExprType(readType())
-        case ERRORtype if isBestEffortTasty =>
-          new PreviousErrorType
+        case ERRORtype =>
+          if isBestEffortTasty then new PreviousErrorType
+          else throw new Error(s"Illegal ERRORtype in non Best Effort TASTy file")
         case _ =>
           ConstantType(readConstant(tag))
       }

compiler/test/dotc/neg-best-effort-unpickling.blacklist

@@ -12,3 +12,6 @@ i14834.scala
 # other type related crashes
 i4653.scala
 overrideClass.scala
+
+# repeating <error> on a top level type definition
+# i18750.scala