diff options
| author | odersky <odersky@gmail.com> | 2016-11-05 13:36:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-05 13:36:07 +0100 |
| commit | 56f6933c7d164a446daa90099ffd3ce31647f6e0 (patch) | |
| tree | f428b829136ac5df1c27b649ad858ecc48e5cc28 /src/dotty/tools/dotc/transform | |
| parent | a0dcc0835ecd467a0704143d7b5b3611c8797243 (diff) | |
| parent | 1dea9916e686adc96df9d7886346af2ed1abe45f (diff) | |
| download | dotty-56f6933c7d164a446daa90099ffd3ce31647f6e0.tar.gz dotty-56f6933c7d164a446daa90099ffd3ce31647f6e0.tar.bz2 dotty-56f6933c7d164a446daa90099ffd3ce31647f6e0.zip | |
Merge pull request #1655 from dotty-staging/change-future-defs-ok
Fix #1637: Future defs are always OK
Diffstat (limited to 'src/dotty/tools/dotc/transform')
| -rw-r--r-- | src/dotty/tools/dotc/transform/PatternMatcher.scala | 3 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/transform/TreeChecker.scala | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/dotty/tools/dotc/transform/PatternMatcher.scala b/src/dotty/tools/dotc/transform/PatternMatcher.scala index 8636d5084..3e25cf82e 100644 --- a/src/dotty/tools/dotc/transform/PatternMatcher.scala +++ b/src/dotty/tools/dotc/transform/PatternMatcher.scala @@ -604,9 +604,8 @@ class PatternMatcher extends MiniPhaseTransform with DenotTransformer { // all potentially stored subpat binders val potentiallyStoredBinders = stored.unzip._1.toSet // compute intersection of all symbols in the tree `in` and all potentially stored subpat binders - def computeBinders(implicit ctx: Context) = new DeepFolder[Unit]((x: Unit, t:Tree) => + new DeepFolder[Unit]((x: Unit, t: Tree) => if (potentiallyStoredBinders(t.symbol)) usedBinders += t.symbol).apply((), in) - computeBinders(ctx.addMode(Mode.FutureDefsOK)) // trigged a NotDefinedHere on $outer when compiler dotc/printing if (usedBinders.isEmpty) in else { diff --git a/src/dotty/tools/dotc/transform/TreeChecker.scala b/src/dotty/tools/dotc/transform/TreeChecker.scala index 808178369..4a09d2fef 100644 --- a/src/dotty/tools/dotc/transform/TreeChecker.scala +++ b/src/dotty/tools/dotc/transform/TreeChecker.scala @@ -69,11 +69,8 @@ class TreeChecker extends Phase with SymTransformer { def checkCompanion(symd: SymDenotation)(implicit ctx: Context): Unit = { val cur = symd.linkedClass - val prev = ctx.atPhase(ctx.phase.prev) { - ct => { - implicit val ctx: Context = ct.addMode(Mode.FutureDefsOK) - symd.symbol.linkedClass - } + val prev = ctx.atPhase(ctx.phase.prev) { implicit ctx => + symd.symbol.linkedClass } if (prev.exists) |