aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/Denotations.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-08-25 18:58:41 +0200
committerMartin Odersky <odersky@gmail.com>2014-08-25 18:58:41 +0200
commiteadfa6a7aa05581f43e7a39de007e2d7823d4cc3 (patch)
tree74a90f4e00cf7e393609b2b22a992cc7cfdd143d /src/dotty/tools/dotc/core/Denotations.scala
parentb41732c15682337c415355accb96224f452b9ff5 (diff)
downloaddotty-eadfa6a7aa05581f43e7a39de007e2d7823d4cc3.tar.gz
dotty-eadfa6a7aa05581f43e7a39de007e2d7823d4cc3.tar.bz2
dotty-eadfa6a7aa05581f43e7a39de007e2d7823d4cc3.zip
Fix to bringforward.
Always bring forward in initial phase. Fixes a stale symbol error discovered when compiling most parts of dotc when turning erasure on by default.
Diffstat (limited to 'src/dotty/tools/dotc/core/Denotations.scala')
-rw-r--r--src/dotty/tools/dotc/core/Denotations.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/Denotations.scala b/src/dotty/tools/dotc/core/Denotations.scala
index 557c80b21..376e63c41 100644
--- a/src/dotty/tools/dotc/core/Denotations.scala
+++ b/src/dotty/tools/dotc/core/Denotations.scala
@@ -13,7 +13,7 @@ import Periods._
import Flags._
import DenotTransformers._
import Decorators._
-import transform.Erasure
+import dotc.transform.Erasure
import printing.Texts._
import printing.Printer
import io.AbstractFile
@@ -495,7 +495,7 @@ object Denotations {
d.validFor = Period(ctx.period.runId, d.validFor.firstPhaseId, d.validFor.lastPhaseId)
d = d.nextInRun
} while (d ne denot)
- initial.syncWithParents
+ syncWithParents
case _ =>
if (coveredInterval.containsPhaseId(ctx.phaseId)) staleSymbolError
else NoDenotation
@@ -524,7 +524,7 @@ object Denotations {
assert(false)
}
- if (valid.runId != currentPeriod.runId) bringForward.current
+ if (valid.runId != currentPeriod.runId) initial.bringForward.current
else {
var cur = this
if (currentPeriod.code > valid.code) {