aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Phases.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2015-11-16 09:25:13 +0100
committerMartin Odersky <odersky@gmail.com>2015-11-17 21:30:21 +0100
commitbd76fbaec088de73deeb443681071bd311624dc1 (patch)
tree4d12bcc56dafab8e0402e2d75522ba2e4273955f /src/dotty/tools/dotc/core/Phases.scala
parentb02c80c2c240b58e8030d2ccf7dc7d7a36b3afe9 (diff)
downloaddotty-bd76fbaec088de73deeb443681071bd311624dc1.tar.gz
dotty-bd76fbaec088de73deeb443681071bd311624dc1.tar.bz2
dotty-bd76fbaec088de73deeb443681071bd311624dc1.zip
Fix bug in phase identification for Ycheck
-Ycheck:era checked after phase resolveSuper. This was due to an overly simplistic containsPhase check.
Diffstat (limited to 'src/dotty/tools/dotc/core/Phases.scala')
-rw-r--r--src/dotty/tools/dotc/core/Phases.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/Phases.scala b/src/dotty/tools/dotc/core/Phases.scala
index 8d5ec08f7..970a9297a 100644
--- a/src/dotty/tools/dotc/core/Phases.scala
+++ b/src/dotty/tools/dotc/core/Phases.scala
@@ -7,6 +7,7 @@ import dotty.tools.backend.jvm.{LabelDefs, GenBCode}
import util.DotClass
import DenotTransformers._
import Denotations._
+import Decorators._
import config.Printers._
import scala.collection.mutable.{ListBuffer, ArrayBuffer}
import dotty.tools.dotc.transform.TreeTransforms.{TreeTransformer, MiniPhase, TreeTransform}
@@ -121,10 +122,9 @@ object Phases {
phase
}
squashedPhases += phaseToAdd
- val shouldAddYCheck = YCheckAfter.exists(nm => phaseToAdd.phaseName.contains(nm)) || YCheckAll
+ val shouldAddYCheck = YCheckAfter.containsPhase(phaseToAdd) || YCheckAll
if (shouldAddYCheck) {
val checker = new TreeChecker
-
squashedPhases += checker
}
}