Fix rebase breakages

Author: allanrenucci

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -117,12 +117,11 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
 
     case class Item2(arrivalPos: Int,
                      mirror:     SubItem2,
-                     plain:      SubItem2,
-                     bean:       SubItem2) {
+                     plain:      SubItem2) {
       def isPoison = { arrivalPos == Int.MaxValue }
     }
 
-    private val poison2 = Item2(Int.MaxValue, null, null, null)
+    private val poison2 = Item2(Int.MaxValue, null, null)
     private val q2 = new _root_.java.util.LinkedList[Item2]
 
     /* ---------------- q3 ---------------- */
@@ -142,8 +141,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
 
     case class Item3(arrivalPos: Int,
                      mirror:     SubItem3,
-                     plain:      SubItem3,
-                     bean:       SubItem3) {
+                     plain:      SubItem3) {
 
       def isPoison  = { arrivalPos == Int.MaxValue }
     }
@@ -154,7 +152,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
         else 1
       }
     }
-    private val poison3 = Item3(Int.MaxValue, null, null, null)
+    private val poison3 = Item3(Int.MaxValue, null, null)
     private val q3 = new java.util.PriorityQueue[Item3](1000, i3comparator)
 
     /*
@@ -248,7 +246,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
 
         // ----------- create files
 
-        val classNodes = List(mirrorC, plainC, beanC)
+        val classNodes = List(mirrorC, plainC)
         val classFiles = classNodes.map(cls =>
           if (outF != null && cls != null) {
             try {
@@ -290,8 +288,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
         val item2 =
           Item2(arrivalPos,
             SubItem2(mirrorC, classFiles(0)),
-            SubItem2(plainC, classFiles(1)),
-            SubItem2(beanC, classFiles(2)))
+            SubItem2(plainC, classFiles(1)))
 
         q2 add item2 // at the very end of this method so that no Worker2 thread starts mutating before we're done.
 
@@ -340,21 +337,17 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
           cw.toByteArray
         }
 
-        val Item2(arrivalPos,
-                  SubItem2(mirror, mirrorFile),
-                  SubItem2(plain, plainFile),
-                  SubItem2(bean, beanFile)) = item
+        val Item2(arrivalPos, SubItem2(mirror, mirrorFile), SubItem2(plain, plainFile)) = item
 
         val mirrorC = if (mirror == null) null else SubItem3(mirror.name, getByteArray(mirror), mirrorFile)
         val plainC  = SubItem3(plain.name, getByteArray(plain), plainFile)
-        val beanC   = if (bean == null)   null else SubItem3(bean.name, getByteArray(bean), beanFile)
 
         if (AsmUtils.traceSerializedClassEnabled && plain.name.contains(AsmUtils.traceSerializedClassPattern)) {
           if (mirrorC != null) AsmUtils.traceClass(mirrorC.jclassBytes)
           AsmUtils.traceClass(plainC.jclassBytes)
         }
 
-        q3 add Item3(arrivalPos, mirrorC, plainC, beanC)
+        q3 add Item3(arrivalPos, mirrorC, plainC)
       }
 
     } // end of class BCodePhase.Worker2
@@ -470,7 +463,6 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
           val item = incoming
           sendToDisk(item.mirror)
           sendToDisk(item.plain)
-          sendToDisk(item.bean)
           expected += 1
         }
       }

project/Build.scala

@@ -537,7 +537,7 @@ object Build {
             path.contains("scala-asm") ||
             // needed for the xsbti interface
             path.contains("compiler-interface") ||
- +          path.contains("util-interface")
+            path.contains("util-interface")
         } yield "-Xbootclasspath/p:" + path
 
         val ci_build = // propagate if this is a ci build
@@ -583,11 +583,11 @@ object Build {
 
         if (args.isEmpty) {
           println("Couldn't run `dotr` without args. Use `repl` to run the repl or add args to run the dotty application")
-        else if (scalaLib == "") {
+        } else if (scalaLib == "") {
           println("Couldn't find scala-library on classpath, please run using script in bin dir instead")
         } else {
           val dottyLib = packageAll.value("dotty-library")
-          val allArgs = insertClasspathInArgs(args, s".:$dottyLib:$scalaLib")
+          val allArgs = "java" :: insertClasspathInArgs(args, s".:$dottyLib:$scalaLib")
           val exitCode = new java.lang.ProcessBuilder(allArgs: _*)
             .inheritIO()
             .start()