scala · mkeskells · Mar 29, 2017 · Feb 26, 2017 · Feb 28, 2017 · Mar 29, 2017
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
@@ -409,7 +409,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
       }
     }
 
-    final def withCurrentUnitNoLog(unit: CompilationUnit)(task: => Unit) {
+    @inline final def withCurrentUnitNoLog[T](unit: CompilationUnit)(task: => T):T = {
       val unit0 = currentUnit
       try {
         currentRun.currentUnit = unit

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala
@@ -26,7 +26,7 @@ import scala.tools.nsc.backend.jvm.BCodeHelpers.{InvokeStyle, TestOp}
  *
  */
 abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
-  import global._
+  import global.{reporter => _, _}
   import definitions._
   import bTypes._
   import coreBTypes._
@@ -1363,11 +1363,11 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
 
   private def visitInvokeDynamicInsnLMF(jmethod: MethodNode, samName: String, invokedType: String, samMethodType: asm.Type,
                                         implMethodHandle: asm.Handle, instantiatedMethodType: asm.Type,
-                                        serializable: Boolean, markerInterfaces: Seq[asm.Type]) = {
+                                        serializable: Boolean, markerInterfaces: List[asm.Type]) = {
     import java.lang.invoke.LambdaMetafactory.{FLAG_MARKERS, FLAG_SERIALIZABLE}
     def flagIf(b: Boolean, flag: Int): Int = if (b) flag else 0
     val flags = FLAG_MARKERS | flagIf(serializable, FLAG_SERIALIZABLE)
-    val bsmArgs = Seq(samMethodType, implMethodHandle, instantiatedMethodType, Int.box(flags), Int.box(markerInterfaces.length)) ++ markerInterfaces
+    val bsmArgs = samMethodType :: implMethodHandle :: instantiatedMethodType :: Int.box(flags) :: Int.box(markerInterfaces.length) :: markerInterfaces
     jmethod.visitInvokeDynamicInsn(samName, invokedType, lambdaMetaFactoryAltMetafactoryHandle, bsmArgs: _*)
   }
 

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala
@@ -8,7 +8,7 @@ package tools.nsc
 package backend.jvm
 
 import scala.tools.asm
-import scala.tools.nsc.io.AbstractFile
+import scala.tools.nsc.io.{AbstractFile, JFile}
 import GenBCode._
 import BackendReporting._
 import scala.reflect.internal.Flags
@@ -20,8 +20,8 @@ import scala.reflect.internal.Flags
  *  @version 1.0
  *
  */
-abstract class BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
-  import global._
+abstract class BCodeHelpers extends BCodeIdiomatic with BytecodeWriters with HasReporter {
+  import global.{reporter => _, _}
   import definitions._
   import bTypes._
   import coreBTypes._
@@ -228,37 +228,10 @@ abstract class BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
   def completeSilentlyAndCheckErroneous(sym: Symbol): Boolean =
     if (sym.hasCompleteInfo) false
     else {
-      val originalReporter = global.reporter
-      val storeReporter = new reporters.StoreReporter()
-      global.reporter = storeReporter
-      try {
-        sym.info
-      } finally {
-        global.reporter = originalReporter
-      }
+      withoutReporting(sym.info)
       sym.isErroneous
     }
 
-
-  /*
-   * must-single-thread
-   */
-  def getFileForClassfile(base: AbstractFile, clsName: String, suffix: String): AbstractFile = {
-    getFile(base, clsName, suffix)
-  }
-
-  /*
-   * must-single-thread
-   */
-  def getOutFolder(csym: Symbol, cName: String, cunit: CompilationUnit): _root_.scala.tools.nsc.io.AbstractFile =
-    _root_.scala.util.Try {
-      outputDirectory(csym)
-    }.recover {
-      case ex: Throwable =>
-        reporter.error(cunit.body.pos, s"Couldn't create file for class $cName\n${ex.getMessage}")
-        null
-    }.get
-
   var pickledBytes = 0 // statistics
 
   // -----------------------------------------------------------------------------------------

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala
@@ -21,10 +21,10 @@ import scala.tools.nsc.backend.jvm.BCodeHelpers.TestOp
  *  @version 1.0
  *
  */
-abstract class BCodeIdiomatic extends SubComponent {
+abstract class BCodeIdiomatic extends SubComponent with HasReporter {
   val bTypes = new BTypesFromSymbols[global.type](global)
 
-  import global._
+  import global.{reporter => _, _}
   import bTypes._
   import coreBTypes._
 

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeParallel.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeParallel.scala
@@ -0,0 +1,8 @@
+package scala.tools.nsc.backend.jvm
+
+/**
+  * Created by dev on 26/02/2017.
+  */
+trait BCodeParallel {
+
+}
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeSkelBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeSkelBuilder.scala
@@ -22,7 +22,7 @@ import scala.tools.nsc.backend.jvm.BCodeHelpers.InvokeStyle
  *
  */
 abstract class BCodeSkelBuilder extends BCodeHelpers {
-  import global._
+  import global.{reporter => _, _}
   import bTypes._
   import coreBTypes._
 

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeSyncAndTry.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeSyncAndTry.scala
@@ -19,7 +19,7 @@ import scala.tools.asm
  *
  */
 abstract class BCodeSyncAndTry extends BCodeBodyBuilder {
-  import global._
+  import global.{reporter => _, _}
   import bTypes._
   import coreBTypes._