Skip to content

Commit 682cd81

Browse files
bubbleUpNothing: do we want it? It breaks the last 4 failing tests
1 parent e1949bb commit 682cd81

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

compiler/src/dotty/tools/dotc/Compiler.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ class Compiler {
8888
new NonLocalReturns, // Expand non-local returns
8989
new CapturedVars, // Represent vars captured by closures as heap objects
9090
new Constructors, // Collect initialization code in primary constructors
91-
// Note: constructors changes decls in transformTemplate, no InfoTransformers should be added after it
91+
// Note: constructors changes decls in transformTemplate, no InfoTransformers should be added after it
9292
new FunctionalInterfaces, // Rewrites closures to implement @specialized types of Functions.
93-
new GetClass, // Rewrites getClass calls on primitive types.
94-
new Simplify), // Perform local optimizations, simplified versions of what linker does.
93+
new GetClass, // Rewrites getClass calls on primitive types.
94+
new Simplify), // Perform local optimizations, simplified versions of what linker does.
9595
List(new LambdaLift, // Lifts out nested functions to class scope, storing free variables in environments
9696
// Note: in this mini-phase block scopes are incorrect. No phases that rely on scopes should be here
9797
new ElimStaticThis, // Replace `this` references to static objects by global identifiers

compiler/src/dotty/tools/dotc/transform/linker/Simplify.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,12 @@ class Simplify extends MiniPhaseTransform with IdentityDenotTransformer {
150150
dropNoEffects ::
151151
// inlineLocalObjects :: // followCases needs to be fixed, see ./tests/pos/rbtree.scala
152152
// varify :: // varify could stop other transformations from being applied. postponed.
153-
bubbleUpNothing ::
153+
// bubbleUpNothing ::
154154
// Still need to import the tailRec thing
155155
// t2429.scala
156156
// constraining-lub.scala
157+
// t8933c.scala
158+
// t348plus.scala
157159
constantFold ::
158160
Nil
159161

0 commit comments

Comments
 (0)