Skip to content

Commit 5a2ae35

Browse files
committed
Run all miniphases at group end
We now have all miniphases running at group end. We can remove the infrastructure to enable other behavior. If some parts of some transformations need to run at a different phase than group end, we can always to `ctx.atPhase { ... }`.
1 parent d02e4f8 commit 5a2ae35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+43
-199
lines changed

compiler/src/dotty/tools/backend/jvm/CollectSuperCalls.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ class CollectSuperCalls extends MiniPhaseTransform {
2222

2323
def phaseName: String = "collectSuperCalls"
2424

25-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
26-
groupEndPhase
27-
2825
override def transformSelect(tree: Select)(implicit ctx: Context, info: TransformerInfo): Tree = {
2926
tree.qualifier match {
3027
case sup: Super =>

compiler/src/dotty/tools/backend/jvm/LabelDefs.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ class LabelDefs extends MiniPhaseTransform {
8888
val beingAppended = new mutable.HashSet[Symbol]()
8989
var labelLevel = 0
9090

91-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
92-
groupEndPhase
93-
9491
override def transformDefDef(tree: tpd.DefDef)(implicit ctx: Context, info: TransformerInfo): tpd.Tree = {
9592
if (tree.symbol is Flags.Label) tree
9693
else {

compiler/src/dotty/tools/dotc/transform/AugmentScala2Traits.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ class AugmentScala2Traits extends MiniPhaseTransform with IdentityDenotTransform
3535

3636
override def phaseName: String = "augmentScala2Traits"
3737

38-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
39-
groupEndPhase
40-
4138
override def rewiredTarget(referenced: Symbol, derived: Symbol)(implicit ctx: Context) = NoSymbol
4239

4340
override def transformTemplate(impl: Template)(implicit ctx: Context, info: TransformerInfo) = {

compiler/src/dotty/tools/dotc/transform/ByNameClosures.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ class ByNameClosures extends TransformByNameApply with IdentityDenotTransformer
2929

3030
override def phaseName: String = "byNameClosures"
3131

32-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
33-
groupEndPhase
34-
3532
override def mkByNameClosure(arg: Tree, argType: Type)(implicit ctx: Context): Tree = {
3633
val meth = ctx.newSymbol(
3734
ctx.owner, nme.ANON_FUN, Synthetic | Method, MethodType(Nil, Nil, argType))

compiler/src/dotty/tools/dotc/transform/CheckReentrant.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ class CheckReentrant extends MiniPhaseTransform { thisTransformer =>
4545

4646
override def phaseName = "checkReentrant"
4747

48-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
49-
groupEndPhase
50-
5148
private[this] var shared: Set[Symbol] = Set()
5249
private[this] var seen: Set[ClassSymbol] = Set()
5350
private[this] var indent: Int = 0

compiler/src/dotty/tools/dotc/transform/CheckStatic.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ class CheckStatic extends MiniPhaseTransform { thisTransformer =>
3939

4040
override def phaseName = "checkStatic"
4141

42-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
43-
groupEndPhase
44-
4542
override def transformTemplate(tree: tpd.Template)(implicit ctx: Context, info: TransformerInfo): tpd.Tree = {
4643
val defns = tree.body.collect{case t: ValOrDefDef => t}
4744
var hadNonStaticField = false

compiler/src/dotty/tools/dotc/transform/ClassOf.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ class ClassOf extends MiniPhaseTransform {
2121

2222
override def phaseName: String = "classOf"
2323

24-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
25-
groupEndPhase
26-
2724
override def transformTypeApply(tree: TypeApply)(implicit ctx: Context, info: TransformerInfo): Tree =
2825
if (tree.symbol eq defn.Predef_classOf) {
2926
val targ = tree.args.head.tpe

compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ import dotty.tools.dotc.config.JavaPlatform
2424

2525
class CollectEntryPoints extends MiniPhaseTransform {
2626

27-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
28-
groupEndPhase
29-
3027
/** perform context-dependant initialization */
3128
override def prepareForUnit(tree: tpd.Tree)(implicit ctx: Context) = {
3229
entryPoints = collection.immutable.TreeSet.empty[Symbol](new SymbolOrdering())

compiler/src/dotty/tools/dotc/transform/Constructors.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ class Constructors extends MiniPhaseTransform with IdentityDenotTransformer { th
3939
// performed before the rhs undergoes the owner change. This would lead
4040
// to more symbols being retained as parameters. Test case in run/capturing.scala.
4141

42-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
43-
groupEndPhase
44-
4542
/** The private vals that are known to be retained as class fields */
4643
private val retainedPrivateVals = mutable.Set[Symbol]()
4744

compiler/src/dotty/tools/dotc/transform/CrossCastAnd.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ class CrossCastAnd extends MiniPhaseTransform { thisTransform =>
1919

2020
override def phaseName: String = "crossCast"
2121

22-
override def treeTransformPhase(implicit ctx: Context, info: TransformerInfo) =
23-
groupEndPhase
24-
2522
override def transformSelect(tree: tpd.Select)(implicit ctx: Context, info: TransformerInfo): tpd.Tree = {
2623

2724
lazy val qtype = tree.qualifier.tpe.widen

0 commit comments

Comments
 (0)