Merge pull request scala#112 from eed3si9n/wip/2453

FPORT: Avoid CCE when scalac internally uses compileLate. Fixes scala#2452
eed3si9n · May 3, 2016 · 8a18517 · 8a18517
2 parents ca433a4 + 7c153a0
commit 8a18517
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src-2.10/main/scala/xsbt/API.scala b/src-2.10/main/scala/xsbt/API.scala
@@ -66,7 +66,7 @@ final class API(val global: CallbackGlobal) extends Compat {
   }
 
   private abstract class TopLevelTraverser extends Traverser {
-    def `class`(s: Symbol)
+    def `class`(s: Symbol): Unit
     override def traverse(tree: Tree): Unit = {
       tree match {
         case (_: ClassDef | _: ModuleDef) if isTopLevel(tree.symbol) => `class`(tree.symbol)

diff --git a/src-2.10/main/scala/xsbt/Dependency.scala b/src-2.10/main/scala/xsbt/Dependency.scala
@@ -33,11 +33,11 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with
   import global._
 
   def newPhase(prev: Phase): Phase = new DependencyPhase(prev)
-  private class DependencyPhase(prev: Phase) extends Phase(prev) {
+  private class DependencyPhase(prev: Phase) extends GlobalPhase(prev) {
     override def description = "Extracts dependency information"
     def name = Dependency.name
-    def run: Unit = {
-      for (unit <- currentRun.units if !unit.isJava) {
+    def apply(unit: CompilationUnit): Unit = {
+      if (!unit.isJava) {
         // build dependencies structure
         val sourceFile = unit.source.file.file
         if (global.callback.nameHashing) {

diff --git a/src/main/scala/xsbt/Dependency.scala b/src/main/scala/xsbt/Dependency.scala
@@ -33,11 +33,11 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile with
   import global._
 
   def newPhase(prev: Phase): Phase = new DependencyPhase(prev)
-  private class DependencyPhase(prev: Phase) extends Phase(prev) {
+  private class DependencyPhase(prev: Phase) extends GlobalPhase(prev) {
     override def description = "Extracts dependency information"
     def name = Dependency.name
-    def run: Unit = {
-      for (unit <- currentRun.units if !unit.isJava) {
+    def apply(unit: CompilationUnit): Unit = {
+      if (!unit.isJava) {
         // build dependencies structure
         val sourceFile = unit.source.file.file
         if (global.callback.nameHashing) {