Update some phase lists

Author: soc

src/compiler/scala/tools/ant/Scalac.scala

@@ -91,7 +91,7 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
     val values = List("namer", "typer", "pickler", "refchecks",
                       "uncurry", "tailcalls", "specialize", "explicitouter",
                       "erasure", "lazyvals", "lambdalift", "constructors",
-                      "flatten", "mixin", "delambdafy", "cleanup", "icode",
+                      "flatten", "mixin", "delambdafy", "cleanup",
                       "jvm", "terminal")
   }
 

src/compiler/scala/tools/nsc/Global.scala

@@ -1428,7 +1428,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
         // move the pointer
         globalPhase = globalPhase.next
 
-        // run tree/icode checkers
+        // run tree checkers
         if (settings.check containsPhase globalPhase.prev)
           runCheckers()
 

src/repl/scala/tools/nsc/interpreter/Phased.scala

@@ -89,9 +89,8 @@ trait Phased {
 
     lazy val all = List(
       Parser, Namer, Packageobjects, Typer, Superaccessors, Pickler, Refchecks,
-      Selectiveanf, Liftcode, Selectivecps, Uncurry, Tailcalls, Specialize,
-      Explicitouter, Erasure, Lazyvals, Lambdalift, Constructors, Flatten, Mixin,
-      Cleanup, Delambdafy, Icode, Inliner, Closelim, Dce, Jvm, Terminal
+      Uncurry, Tailcalls, Specialize, Explicitouter, Erasure, Lazyvals, Lambdalift,
+      Constructors, Flatten, Mixin, Cleanup, Delambdafy, Jvm, Terminal
     )
     lazy val nameMap = all.map(x => x.name -> x).toMap withDefaultValue NoPhaseName
     multi = all
@@ -110,28 +109,24 @@ trait Phased {
   case object Namer extends PhaseName
   case object Packageobjects extends PhaseName
   case object Typer extends PhaseName
+  case object Patmat extends PhaseName
   case object Superaccessors extends PhaseName
+  case object Extmethods extends PhaseName
   case object Pickler extends PhaseName
   case object Refchecks extends PhaseName
-  case object Selectiveanf extends PhaseName
-  case object Liftcode extends PhaseName
-  case object Selectivecps extends PhaseName
   case object Uncurry extends PhaseName
   case object Tailcalls extends PhaseName
   case object Specialize extends PhaseName
   case object Explicitouter extends PhaseName
   case object Erasure extends PhaseName
+  case object PostErasure extends PhaseName
   case object Lazyvals extends PhaseName
   case object Lambdalift extends PhaseName
   case object Constructors extends PhaseName
   case object Flatten extends PhaseName
   case object Mixin extends PhaseName
   case object Cleanup extends PhaseName
   case object Delambdafy extends PhaseName
-  case object Icode extends PhaseName
-  case object Inliner extends PhaseName
-  case object Closelim extends PhaseName
-  case object Dce extends PhaseName
   case object Jvm extends PhaseName
   case object Terminal extends PhaseName
   case object NoPhaseName extends PhaseName {