Skip to content

Commit eb2ca08

Browse files
authored
Merge pull request scala#8427 from lrytz/phase-no-slack-12
Make compiler phase ordering unambiguous (2.12.x)
2 parents cdc7c66 + a7edfa4 commit eb2ca08

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/compiler/scala/tools/nsc/Global.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -546,20 +546,20 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
546546
val runsRightAfter = None
547547
} with TailCalls
548548

549-
// phaseName = "explicitouter"
550-
object explicitOuter extends {
551-
val global: Global.this.type = Global.this
552-
val runsAfter = List("tailcalls")
553-
val runsRightAfter = None
554-
} with ExplicitOuter
555-
556549
// phaseName = "specialize"
557550
object specializeTypes extends {
558551
val global: Global.this.type = Global.this
559552
val runsAfter = List("")
560553
val runsRightAfter = Some("tailcalls")
561554
} with SpecializeTypes
562555

556+
// phaseName = "explicitouter"
557+
object explicitOuter extends {
558+
val global: Global.this.type = Global.this
559+
val runsAfter = List("specialize")
560+
val runsRightAfter = None
561+
} with ExplicitOuter
562+
563563
// phaseName = "erasure"
564564
override object erasure extends {
565565
val global: Global.this.type = Global.this
@@ -578,7 +578,7 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
578578
// phaseName = "lambdalift"
579579
object lambdaLift extends {
580580
val global: Global.this.type = Global.this
581-
val runsAfter = List("erasure")
581+
val runsAfter = List("posterasure")
582582
val runsRightAfter = None
583583
} with LambdaLift
584584

@@ -599,7 +599,7 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
599599
// phaseName = "mixin"
600600
object mixer extends {
601601
val global: Global.this.type = Global.this
602-
val runsAfter = List("flatten", "constructors")
602+
val runsAfter = List("flatten")
603603
val runsRightAfter = None
604604
} with Mixin
605605

0 commit comments

Comments
 (0)