Skip to content

Commit 0a2fe87

Browse files
committed
Disable splitter
1 parent 1aeac76 commit 0a2fe87

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ class Compiler {
6969
new ExplicitOuter, // Add accessors to outer classes from nested ones.
7070
new ExplicitSelf, // Make references to non-trivial self types explicit as casts
7171
new StringInterpolatorOpt, // Optimizes raw and s string interpolators by rewriting them to string concatentations
72-
new CrossCastAnd, // Normalize selections involving intersection types.
73-
new Splitter) :: // Expand selections involving union types into conditionals
72+
new CrossCastAnd) :: // Normalize selections involving intersection types.
7473
List(new PruneErasedDefs, // Drop erased definitions from scopes and simplify erased expressions
7574
new VCInlineMethods, // Inlines calls to value class methods
7675
new SeqLiterals, // Express vararg arguments as arrays

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ class ElimByName extends TransformByNameApply with InfoTransformer {
3636

3737
override def phaseName: String = ElimByName.name
3838

39-
override def runsAfterGroupsOf: Set[String] = Set(Splitter.name)
40-
// I got errors running this phase in an earlier group, but I did not track them down.
41-
4239
override def changesParents: Boolean = true // Only true for by-names
4340

4441
/** Map `tree` to `tree.apply()` is `ftree` was of ExprType and becomes now a function */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Erasure extends Phase with DenotTransformer {
3434
override def phaseName: String = Erasure.name
3535

3636
/** List of names of phases that should precede this phase */
37-
override def runsAfter: Set[String] = Set(InterceptedMethods.name, Splitter.name, ElimRepeated.name)
37+
override def runsAfter: Set[String] = Set(InterceptedMethods.name, ElimRepeated.name)
3838

3939
override def changesMembers: Boolean = true // the phase adds bridges
4040
override def changesParents: Boolean = true // the phase drops Any

compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import vulpix.TestConfiguration
1717
class PatmatExhaustivityTest {
1818
val testsDir = "tests/patmat"
1919
// stop-after: patmatexhaust-huge.scala crash compiler
20-
val options = List("-color:never", "-Ystop-after:splitter", "-Ycheck-all-patmat", "-classpath", TestConfiguration.basicClasspath)
20+
val options = List("-color:never", "-Ystop-after:crossCast", "-Ycheck-all-patmat", "-classpath", TestConfiguration.basicClasspath)
2121

2222
private def compileFile(path: JPath) = {
2323
val stringBuffer = new StringWriter()

0 commit comments

Comments
 (0)