Revert changes to compiler

As the compiler supports already adding custom phases,
there is no need to add the phases to the compiler.

Author: liufengyun

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -57,8 +57,7 @@ class Compiler {
          new CheckReentrant,         // Internal use only: Check that compiled program has no data races involving global vars
          new ElimPackagePrefixes,    // Eliminate references to package prefixes in Select nodes
          new CookComments,           // Cook the comments: expand variables, doc, etc.
-         new CompleteJavaEnums,      // Fill in constructors for Java enums
-         new SetDefTree) ::          // set `symbol.defTree`
+         new CompleteJavaEnums) ::   // Fill in constructors for Java enums
     List(new CheckStatic,            // Check restrictions that apply to @static members
          new ElimRepeated,           // Rewrite vararg parameters and arguments
          new ExpandSAMs,             // Expand single abstract method closures to anonymous classes
@@ -70,7 +69,6 @@ class Compiler {
          new HoistSuperArgs,         // Hoist complex arguments of supercalls to enclosing scope
          new ClassOf,                // Expand `Predef.classOf` calls.
          new RefChecks) ::           // Various checks mostly related to abstract members and overriding
-         // new SetDefTreeOff) ::       // unset `symbol.defTree`
     List(new ElimOpaque,             // Turn opaque into normal aliases
          new TryCatchPatterns,       // Compile cases in try/catch
          new PatternMatcher,         // Compile pattern matches

sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/Analyzer.scala

@@ -13,20 +13,24 @@ import Decorators._
 import Symbols.Symbol
 import Constants.Constant
 import Types._
-import transform.{SetDefTree, SetDefTreeOff}
+import transform.{CheckStatic}
 
-class InitChecker extends PluginPhase with StandardPlugin {
+class InitPlugin extends StandardPlugin {
   import tpd._
-
-  val name: String = "initChecker"
+  val name: String = "initPlugin"
   override val description: String = "checks that under -Yretain-trees we may get tree for all symbols"
 
-  val phaseName = name
+  def init(options: List[String]): List[PluginPhase] =
+    (new SetDefTree) :: (new InitChecker) :: Nil
+}
 
-  override val runsAfter = Set(SetDefTree.name)
-  override val runsBefore = Set(SetDefTreeOff.name)
+class InitChecker extends PluginPhase {
+  import tpd._
 
-  def init(options: List[String]): List[PluginPhase] = this :: Nil
+  val phaseName = "symbolTreeChecker"
+
+  override val runsAfter = Set(SetDefTree.name)
+  override val runsBefore = Set(CheckStatic.name)
 
   private def checkDef(tree: Tree)(implicit ctx: Context): Tree = {
     if (tree.symbol.defTree.isEmpty)

compiler/src/dotty/tools/dotc/transform/SetDefTree.scala renamed to sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTree.scala

@@ -1,20 +1,23 @@
-package dotty.tools.dotc.transform
+package analyzer
 
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.transform.MegaPhase._
+import dotty.tools.dotc.transform.{ReifyQuotes, FirstTransform}
+import dotty.tools.dotc.plugins._
 
 /** Set the `defTree` property of symbols for compile plugins
  *  that perform "whole-program" analysis.
  *
  *  All plugins that depend on `symbol.defTree` should sit
  *  between the phase `SetDefTree` and `SetDefTreeOff`.
  */
-class SetDefTree extends MiniPhase {
+class SetDefTree extends PluginPhase {
   import tpd._
 
   override val phaseName: String = SetDefTree.name
   override def runsAfter: Set[String] = Set(ReifyQuotes.name)
+  override def runsBefore: Set[String] = Set(FirstTransform.name)
     // don't allow plugins to change tasty
     // research plugins can still change the phase plan at will
 

compiler/src/dotty/tools/dotc/transform/SetDefTreeOff.scala renamed to sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/SetDefTreeOff.scala

@@ -1,15 +1,18 @@
-package dotty.tools.dotc.transform
+package analyzer
 
 import dotty.tools.dotc.ast.tpd
 import dotty.tools.dotc.core.Contexts.Context
 import dotty.tools.dotc.transform.MegaPhase._
+import dotty.tools.dotc.transform.{ReifyQuotes, FirstTransform}
+import dotty.tools.dotc.plugins._
 
 /** Unset the `defTree` property of symbols. See the doc for `SetDefTree` */
-class SetDefTreeOff extends MiniPhase {
+class SetDefTreeOff extends PluginPhase {
   import tpd._
 
   override val phaseName: String = SetDefTreeOff.name
   override def runsAfter: Set[String] = Set(SetDefTree.name)
+  override def runsBefore: Set[String] = Set(FirstTransform.name)
 
   override def transformValDef(tree: ValDef)(implicit ctx: Context): Tree = {
     tree.symbol.defTree = EmptyTree

sbt-dotty/sbt-test/sbt-dotty/analyzer-plugin/plugin/src/main/resources/plugin.properties

@@ -1 +1 @@
-pluginClass=analyzer.InitChecker
+pluginClass=analyzer.InitPlugin

tests/plugins/custom/analyzer/Analyzer_1.scala

@@ -13,7 +13,27 @@ import Decorators._
 import Symbols.Symbol
 import Constants.Constant
 import Types._
-import transform.{SetDefTree, SetDefTreeOff}
+import transform.{ReifyQuotes, FirstTransform}
+
+class SetDefTree extends PluginPhase {
+  import tpd._
+
+  override val phaseName: String = SetDefTree.name
+  override def runsAfter: Set[String] = Set(ReifyQuotes.name)
+  override def runsBefore: Set[String] = Set(FirstTransform.name)
+    // don't allow plugins to change tasty
+    // research plugins can still change the phase plan at will
+
+  override def transformValDef(tree: ValDef)(implicit ctx: Context): Tree = tree.setDefTree
+
+  override def transformDefDef(tree: DefDef)(implicit ctx: Context): Tree = tree.setDefTree
+
+  override def transformTypeDef(tree: TypeDef)(implicit ctx: Context): Tree = tree.setDefTree
+}
+
+object SetDefTree {
+  val name: String = "SetDefTree"
+}
 
 class InitChecker extends PluginPhase with StandardPlugin {
   import tpd._
@@ -24,9 +44,9 @@ class InitChecker extends PluginPhase with StandardPlugin {
   val phaseName = name
 
   override val runsAfter = Set(SetDefTree.name)
-  override val runsBefore = Set(SetDefTreeOff.name)
+  override val runsBefore = Set(FirstTransform.name)
 
-  def init(options: List[String]): List[PluginPhase] = this :: Nil
+  def init(options: List[String]): List[PluginPhase] = this :: (new SetDefTree) :: Nil
 
   private def checkDef(tree: Tree)(implicit ctx: Context): Tree = {
     if (tree.symbol.defTree.isEmpty)