add non-research plugin tests

Author: liufengyun

compiler/src/dotty/tools/dotc/plugins/Plugin.scala

@@ -5,13 +5,14 @@ import core._
 import Contexts._
 import Phases._
 import dotty.tools.io._
+import transform.MegaPhase.MiniPhase
 
 import java.io.InputStream
 
 import scala.collection.mutable
 import scala.util.{ Try, Success, Failure }
 
-trait PluginPhase extends Phase {
+trait PluginPhase extends MiniPhase {
   def runsBefore: Set[Class[_ <: Phase]] = Set.empty
 }
 
@@ -22,9 +23,6 @@ trait Plugin {
   /** A one-line description of the plugin */
   def description: String
 
-  /** The phases that this plugin defines */
-  def components: List[PluginPhase] = Nil
-
   /** Is this plugin a research plugin?
    *
    *  Research plugin receives a phase plan and return a new phase plan, while
@@ -46,13 +44,13 @@ trait Plugin {
    *
    *  @return a list of phases to be added to the phase plan
    */
-  def init()(implicit ctx: Context): List[Phase] = Nil
+  def init()(implicit ctx: Context): List[PluginPhase] = ???
 
    /** Research plugins should override this method to return the new phase plan
     *
     *  @return the new phase plan
     */
-  def init(phases: List[List[Phase]])(implicit ctx: Context): List[List[Phase]] = phases
+  def init(phases: List[List[Phase]])(implicit ctx: Context): List[List[Phase]] = ???
 
   /** A description of this plugin's options, suitable as a response
    *  to the -help command-line option.  Conventionally, the options

compiler/src/dotty/tools/dotc/plugins/Plugins.scala

@@ -148,7 +148,7 @@ trait Plugins {
     // add non-research plugins
     var updatedPlan = plan
     plugins.filter(!_.research).foreach { plug =>
-      plug.components.foreach { phase =>
+      plug.init().foreach { phase =>
         updateOrdering(phase)
 
         val beforePhases: MSet[Class[_]] = MSet(phase.runsBefore.toSeq: _*)

tests/plugins/neg/divideZero-research/Test_2.scala

@@ -0,0 +1,6 @@
+class Test {
+  val y = 5 / 0   // error
+  100 + 6 / 0     // error
+  6L / 0L         // error
+  val z = 7 / 0.0 // error
+}

tests/plugins/neg/divideZero-research/plugin_1.scala

@@ -0,0 +1,39 @@
+import dotty.tools.dotc._
+import core._
+import Contexts.Context
+import plugins.Plugin
+import Phases.Phase
+import ast.tpd
+import transform.MegaPhase.MiniPhase
+import Decorators._
+import Symbols.Symbol
+import Constants.Constant
+
+class DivideZero extends MiniPhase with Plugin {
+  val name: String = "divideZero"
+  override val description: String = "divide zero check"
+
+  override val research = true
+
+  val phaseName = name
+
+  override def init(phases: List[List[Phase]])(implicit ctx: Context): List[List[Phase]] = {
+    val (before, after) = phases.span(ps => !ps.exists(_.phaseName == "pickler"))
+    before ++ (List(this) :: after)
+  }
+
+  private def isNumericDivide(sym: Symbol)(implicit ctx: Context): Boolean = {
+    def test(tpe: String): Boolean =
+      (sym.owner eq ctx.requiredClass(tpe.toTermName)) && sym.name.show == "/"
+
+    test("scala.Int") || test("scala.Long") || test("scala.Short") || test("scala.FLoat") || test("scala.Double")
+  }
+
+  override def transformApply(tree: tpd.Apply)(implicit ctx: Context): tpd.Tree = tree match {
+    case tpd.Apply(fun, tpd.Literal(Constants.Constant(v)) :: Nil) if isNumericDivide(fun.symbol) && v == 0 =>
+      ctx.error("divide by zero", tree.pos)
+      tree
+    case _ =>
+      tree
+  }
+}

tests/plugins/neg/divideZero-research/scalac-plugin.xml

@@ -0,0 +1,4 @@
+<plugin>
+  <name>divideZero</name>
+  <classname>DivideZero</classname>
+</plugin>

tests/plugins/neg/divideZero/plugin_1.scala

@@ -1,26 +1,25 @@
 import dotty.tools.dotc._
 import core._
 import Contexts.Context
-import plugins.Plugin
+import plugins.{Plugin, PluginPhase}
 import Phases.Phase
 import ast.tpd
 import transform.MegaPhase.MiniPhase
 import Decorators._
 import Symbols.Symbol
 import Constants.Constant
+import transform.{LinkAll, Pickler}
 
-class DivideZero extends MiniPhase with Plugin {
+class DivideZero extends PluginPhase with Plugin {
   val name: String = "divideZero"
   override val description: String = "divide zero check"
 
-  override val research = true
-
   val phaseName = name
 
-  override def init(phases: List[List[Phase]])(implicit ctx: Context): List[List[Phase]] = {
-    val (before, after) = phases.span(ps => !ps.exists(_.phaseName == "pickler"))
-    before ++ (List(this) :: after)
-  }
+  override val runsAfter = Set(classOf[Pickler])
+  override val runsBefore = Set(classOf[LinkAll])
+
+  override def init()(implicit ctx: Context): List[PluginPhase] = this :: Nil
 
   private def isNumericDivide(sym: Symbol)(implicit ctx: Context): Boolean = {
     def test(tpe: String): Boolean =