Skip to content

Commit b7c196e

Browse files
committed
Remove fruitless overrides of treeTransformPhase
Now the default phase of treeTransformPhase is phase.next, we can remove all overrides that specify the same phase.
1 parent cf3af0e commit b7c196e

21 files changed

+1
-30
lines changed

src/dotty/tools/dotc/transform/CapturedVars.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisTransfo
2626

2727
class Transform(captured: collection.Set[Symbol]) extends TreeTransform {
2828
def phase = thisTransform
29-
override def treeTransformPhase = thisTransform.next
3029

3130
private class CollectCaptured(implicit ctx: Context) extends EnclosingMethodTraverser {
3231
private val captured = mutable.HashSet[Symbol]()

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class Constructors extends MiniPhaseTransform with SymTransformer { thisTransfor
3131
override def phaseName: String = "constructors"
3232
override def runsAfter: Set[Class[_ <: Phase]] = Set(classOf[Erasure])
3333

34-
override def treeTransformPhase = thisTransform.next
35-
3634
/** Symbols that are owned by either <local dummy> or a class field move into the
3735
* primary constructor.
3836
*/

src/dotty/tools/dotc/transform/ElimByName.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ class ElimByName extends MiniPhaseTransform with InfoTransformer { thisTransform
5151
// assumes idents and selects have symbols; interferes with splitter distribution
5252
// that's why it's "after group".
5353

54-
override def treeTransformPhase = thisTransformer.next
55-
5654
/** The info of the tree's symbol at phase Nullarify (i.e. before transformation) */
5755
private def originalDenotation(tree: Tree)(implicit ctx: Context) =
5856
tree.symbol.denot(ctx.withPhase(thisTransformer))

src/dotty/tools/dotc/transform/ExplicitOuter.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class ExplicitOuter extends MiniPhaseTransform with InfoTransformer { thisTransf
4343
* before this phase starts
4444
*/
4545
override def runsAfter: Set[Class[_ <: Phase]] = Set(classOf[PatternMatcher])
46-
override def treeTransformPhase = thisTransformer.next
4746

4847
/** Add outer accessors if a class always needs an outer pointer */
4948
override def transformInfo(tp: Type, sym: Symbol)(implicit ctx: Context) = tp match {

src/dotty/tools/dotc/transform/ExtensionMethods.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ class ExtensionMethods extends MiniPhaseTransform with DenotTransformer with Ful
5757
ref
5858
}
5959

60-
override def treeTransformPhase = thisTransformer.next
61-
6260
protected def rewiredTarget(target: Symbol, derived: Symbol)(implicit ctx: Context): Symbol =
6361
if (isMethodWithExtension(target) &&
6462
target.owner.linkedClass == derived.owner) extensionMethod(target)

src/dotty/tools/dotc/transform/Flatten.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ class Flatten extends MiniPhaseTransform with SymTransformer { thisTransform =>
2525
else ref
2626
}
2727

28-
override def treeTransformPhase = thisTransform.next
29-
3028
private val liftedDefs = new mutable.ListBuffer[Tree]
3129

3230
private def liftIfNested(tree: Tree)(implicit ctx: Context, info: TransformerInfo) =

src/dotty/tools/dotc/transform/Getters.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ class Getters extends MiniPhaseTransform with SymTransformer { thisTransform =>
4343
import ast.tpd._
4444

4545
override def phaseName = "getters"
46-
override def treeTransformPhase = thisTransform.next
4746

4847
override def transformSym(d: SymDenotation)(implicit ctx: Context): SymDenotation = {
4948
def noGetterNeeded =

src/dotty/tools/dotc/transform/InterceptedMethods.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class InterceptedMethods extends MiniPhaseTransform { thisTransform =>
4545
import tpd._
4646

4747
override def phaseName: String = "intercepted"
48-
override def treeTransformPhase = thisTransform.next
4948

5049
private var getClassMethods: Set[Symbol] = _
5150
private var poundPoundMethods: Set[Symbol] = _

src/dotty/tools/dotc/transform/LambdaLift.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform
4545

4646
class LambdaLifter extends TreeTransform {
4747
override def phase = thisTransform
48-
override def treeTransformPhase = thisTransform.next
4948

5049
private type SymSet = TreeSet[Symbol]
5150

src/dotty/tools/dotc/transform/LazyVals.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ class LazyValsTransform extends MiniPhaseTransform with IdentityDenotTransformer
3737

3838
override def phaseName: String = "LazyVals"
3939

40-
override def treeTransformPhase = this.next
41-
4240
/** List of names of phases that should have finished processing of tree
4341
* before this phase starts processing same tree */
4442
// override def ensureAfter: Set[String] = Set("mixin")

src/dotty/tools/dotc/transform/Literalize.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class Literalize extends MiniPhaseTransform { thisTransform =>
1919
import ast.tpd._
2020

2121
override def phaseName: String = "literalize"
22-
override def treeTransformPhase = thisTransform.next
2322

2423
/** Note: Demanding idempotency instead of purity is strictly speaking too loose.
2524
* Example

src/dotty/tools/dotc/transform/Memoize.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import Decorators._
3535
import ast.tpd._
3636

3737
override def phaseName = "memoize"
38-
override def treeTransformPhase = thisTransform.next
3938

4039
/** Should to run after mixin so that fields get generated in the
4140
* class that contains the concrete getter rather than the trait

src/dotty/tools/dotc/transform/Mixin.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class Mixin extends MiniPhaseTransform with SymTransformer { thisTransform =>
6767
import ast.tpd._
6868

6969
override def phaseName: String = "mixin"
70-
override def treeTransformPhase = thisTransform.next
7170

7271
override def runsAfter: Set[Class[_ <: Phase]] = Set(classOf[Erasure])
7372

src/dotty/tools/dotc/transform/PatternMatcher.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ import scala.reflect.internal.util.Collections
3636
class PatternMatcher extends MiniPhaseTransform with DenotTransformer {thisTransformer =>
3737
import dotty.tools.dotc.ast.tpd._
3838

39-
override def treeTransformPhase = thisTransformer.next
40-
4139
override def transform(ref: SingleDenotation)(implicit ctx: Context): SingleDenotation = ref
4240

4341
override def runsAfter = Set(classOf[ElimRepeated])

src/dotty/tools/dotc/transform/PrivateToStatic.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class PrivateToStatic extends MiniPhase with SymTransformer { thisTransform =>
4848

4949
class Transform(thisParam: Symbol) extends TreeTransform {
5050
def phase = thisTransform
51-
override def treeTransformPhase = thisTransform.next
5251

5352
override def prepareForDefDef(tree: DefDef)(implicit ctx: Context) =
5453
if (shouldBeStatic(tree.symbol)) {

src/dotty/tools/dotc/transform/ResolveSuper.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ class ResolveSuper extends MiniPhaseTransform with IdentityDenotTransformer { th
4848

4949
override def phaseName: String = "resolveSuper"
5050

51-
override def treeTransformPhase = thisTransform.next
52-
5351
/** Returns the symbol that is accessed by a super-accessor in a mixin composition.
5452
*
5553
* @param base The class in which everything is mixed together

src/dotty/tools/dotc/transform/RestoreScopes.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ class RestoreScopes extends MiniPhaseTransform with IdentityDenotTransformer { t
1919
import ast.tpd._
2020
override def phaseName = "restoreScopes"
2121

22-
override def treeTransformPhase = thisTransform.next
23-
2422
override def transformTypeDef(tree: TypeDef)(implicit ctx: Context, info: TransformerInfo) = {
2523
val TypeDef(_, Template(constr, _, _, body)) = tree
2624
val restoredDecls = newScope

src/dotty/tools/dotc/transform/SeqLiterals.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ import Decorators._
1818
* is called directly. The reason for this step is that JavaSeqLiterals, being arrays
1919
* keep a precise type after erasure, whereas SeqLiterals only get the erased type `Seq`,
2020
*/
21-
class SeqLiterals extends MiniPhaseTransform { thisTransformer =>
21+
class SeqLiterals extends MiniPhaseTransform {
2222
import ast.tpd._
2323

2424
override def phaseName = "seqLiterals"
25-
override def treeTransformPhase = thisTransformer.next
2625
override def runsAfter: Set[Class[_ <: Phase]] = Set(classOf[PatternMatcher])
2726

2827
override def checkPostCondition(tree: Tree)(implicit ctx: Context): Unit = tree match {

src/dotty/tools/dotc/transform/Splitter.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class Splitter extends MiniPhaseTransform { thisTransform =>
1616
import ast.tpd._
1717

1818
override def phaseName: String = "splitter"
19-
override def treeTransformPhase = thisTransform.next
2019

2120
/** Replace self referencing idents with ThisTypes. */
2221
override def transformIdent(tree: Ident)(implicit ctx: Context, info: TransformerInfo) = tree.tpe match {

src/dotty/tools/dotc/transform/SyntheticMethods.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class SyntheticMethods extends MiniPhaseTransform with IdentityDenotTransformer
3535
import ast.tpd._
3636

3737
override def phaseName = "synthetics"
38-
override def treeTransformPhase = thisTransformer.next
3938

4039
private var valueSymbols: List[Symbol] = _
4140
private var caseSymbols: List[Symbol] = _

src/dotty/tools/dotc/typer/RefChecks.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,6 @@ class RefChecks extends MiniPhase with SymTransformer { thisTransformer =>
745745

746746
class Transform(currentLevel: RefChecks.OptLevelInfo = RefChecks.NoLevelInfo) extends TreeTransform {
747747
def phase = thisTransformer
748-
override def treeTransformPhase = thisTransformer.next
749748

750749
override def prepareForStats(trees: List[Tree])(implicit ctx: Context) = {
751750
// println(i"preparing for $trees%; %, owner = ${ctx.owner}")

0 commit comments

Comments
 (0)