Readjusted when -Ycheck:phase operates to get a...

Readjusted when -Ycheck:phase operates to get around the problem with
erasedTypes.

3 files changed, 7 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 8eb42292d1..b942d81591 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -586,9 +586,11 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable
 
         if (settings.browse contains globalPhase.name) treeBrowser.browse(units)
         informTime(globalPhase.description, startTime)
-        if ((settings.check contains globalPhase.name) ||
+        globalPhase = globalPhase.next
+
+        if ((settings.check contains globalPhase.prev.name) ||
 	    (settings.check contains "all")) {
-          if (globalPhase.checkable) {
+          if (globalPhase.prev.checkable) {
             phase = globalPhase
             if (globalPhase.id >= icodePhase.id) icodeChecker.checkICodes
             else checker.checkTrees
@@ -596,7 +598,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable
             warning("It is not possible to check the result of the "+globalPhase.name+" phase")
 	  }
         }
-        globalPhase = globalPhase.next
+
         if (settings.statistics.value) statistics.print(phase)
         advancePhase
       }
diff --git a/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala b/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala
index 76a79ef781..23cc47f06a 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala
@@ -71,7 +71,7 @@ abstract class Checkers {
 
     def checkICodes: Unit = {
       if (settings.verbose.value)
-	Console.println("[[consistency check at end of phase " + globalPhase.name + "]]")
+	Console.println("[[consistency check at the beginning of phase " + globalPhase.name + "]]")
       classes.values foreach check
     }
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
index 077b66035f..8fbd2f7ae0 100644
--- a/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
@@ -17,7 +17,7 @@ abstract class TreeCheckers extends Analyzer {
 
   def checkTrees {
     if (settings.verbose.value)
-      Console.println("[consistency check at end of phase " + phase + "]")
+      Console.println("[consistency check at the beginning of phase " + phase + "]")
     for (unit <- currentRun.units) check(unit)
   }