fixup

Author: retronym

src/compiler/scala/tools/nsc/PipelineMain.scala

@@ -8,7 +8,7 @@ import java.nio.file.{Files, Path, Paths}
 
 import scala.collection.mutable
 import scala.reflect.internal.util.FakePos
-import scala.tools.nsc.reporters.Reporter
+import scala.tools.nsc.reporters.{ConsoleReporter, Reporter}
 import scala.tools.nsc.util.ClassPath
 
 
@@ -20,7 +20,7 @@ class PipelineMainClass {
 
   private var reporter: Reporter = _
   def process(args: Array[String]): Boolean = {
-    reporter = Reporter(new Settings(scalacError))
+    reporter = new ConsoleReporter(new Settings(scalacError))
 
     def commandFor(argFileArg: String): CompilerCommand = {
       val ss   = new Settings(scalacError)

src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala

@@ -175,7 +175,7 @@ abstract class ClassfileParser {
         case None =>
           this.in = new AbstractFileReader(file)
           parseHeader()
-          this.pool = new ConstantPool
+          this.pool = newConstantPool
           parseClass()
       }
       if (isScalaRaw && !isNothingOrNull) {
@@ -479,9 +479,7 @@ abstract class ClassfileParser {
     n == "scala.runtime.Nothing$" || n == "scala.runtime.Null$"
   }
 
-  def parseClass(): Unit = {
-    unpickleOrParseInnerClasses()
-
+  def parseClass() {
     val jflags   = readClassFlags()
     val sflags   = jflags.toScalaFlags
     val nameIdx  = u2
@@ -513,24 +511,6 @@ abstract class ClassfileParser {
       if (!c.isInstanceOf[StubSymbol] && c != clazz) mismatchError(c)
     }
 
-    if (isScala) {
-      () // We're done
-    } else if (isScalaRaw && !isNothingOrNull) {
-      val decls = clazz.enclosingPackage.info.decls
-      for (c <- List(clazz, staticModule, staticModule.moduleClass)) {
-        c.setInfo(NoType)
-        decls.unlink(c)
-      }
-    } else {
-      val sflags = jflags.toScalaFlags // includes JAVA
-
-      def parseParents(): List[Type] = raiseLoaderLevel {
-        val superType = pool.getSuperClass(u2).tpe_*
-        val ifaceCount = u2
-        val ifaces = for (i <- List.range(0, ifaceCount)) yield pool.getSuperClass(u2).tpe_*
-        superType :: ifaces
-      }
-
     addEnclosingTParams(clazz)
     parseInnerClasses() // also sets the isScala / isScalaRaw flags, see r15956
     // get the class file parser to reuse scopes.