Skip to content

Commit c302f00

Browse files
committed
Drop atGroupEnd
It's no longer needed, since it's the default now.
1 parent 5a2ae35 commit c302f00

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ class ExtensionMethods extends MiniPhaseTransform with DenotTransformer with Ful
175175
extensionDefs(staticClass) = newC
176176
newC
177177
}
178-
store += atGroupEnd(fullyParameterizedDef(extensionMeth, tree)(_))
179-
cpy.DefDef(tree)(rhs = atGroupEnd(forwarder(extensionMeth, tree)(_)))
178+
store += fullyParameterizedDef(extensionMeth, tree)
179+
cpy.DefDef(tree)(rhs = forwarder(extensionMeth, tree))
180180
} else tree
181181
}
182182
}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,10 @@ class LazyVals extends MiniPhaseTransform with IdentityDenotTransformer {
166166
// backend requires field usage to be after field definition
167167
// need to bring containers to start of method
168168
val (holders, stats) =
169-
atGroupEnd { implicit ctx: Context =>
170-
trees.partition {
171-
_.symbol.flags.&~(Flags.Touched) == containerFlags
172-
// Filtering out Flags.Touched is not required currently, as there are no LazyTypes involved here
173-
// but just to be more safe
174-
}
169+
trees.partition {
170+
_.symbol.flags.&~(Flags.Touched) == containerFlags
171+
// Filtering out Flags.Touched is not required currently, as there are no LazyTypes involved here
172+
// but just to be more safe
175173
}
176174
holders:::stats
177175
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class TailRec extends MiniPhaseTransform with FullParameterization { thisTransfo
115115
// now this speculatively transforms tree and throws away result in many cases
116116
val rhsSemiTransformed = {
117117
val transformer = new TailRecElimination(origMeth, dd.tparams, owner, thisTpe, mandatory, label, abstractOverClass = defIsTopLevel)
118-
val rhs = atGroupEnd(implicit ctx => transformer.transform(dd.rhs))
118+
val rhs = transformer.transform(dd.rhs)
119119
rewrote = transformer.rewrote
120120
rhs
121121
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@ object TreeTransforms {
137137

138138
/** Transform single node using all transforms following the current one in this group */
139139
def transformFollowing(tree: Tree)(implicit ctx: Context, info: TransformerInfo): Tree = info.group.transformSingle(tree, phase.idx + 1)
140-
141-
def atGroupEnd[T](action : Context => T)(implicit ctx: Context, info: TransformerInfo) =
142-
action(ctx.withPhase(groupEndPhase))
143-
144-
def groupEndPhase(implicit ctx: Context, info: TransformerInfo) =
145-
info.transformers(info.transformers.length - 1).phase.next
146140
}
147141

148142
/** A phase that defines a TreeTransform to be used in a group */

0 commit comments

Comments
 (0)