diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-10-26 09:41:25 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-10-26 09:43:50 +0100 |
| commit | d4f30d1a268a51ee74c98f6ae0f45136274536af (patch) | |
| tree | 18a7e21c87f31a9e90f3cf5c40d0cd2c9be19763 /src/dotty/tools/dotc/core/TyperState.scala | |
| parent | 75ac4010609c7d3ac856523d8f2d59e710a4c58c (diff) | |
| download | dotty-d4f30d1a268a51ee74c98f6ae0f45136274536af.tar.gz dotty-d4f30d1a268a51ee74c98f6ae0f45136274536af.tar.bz2 dotty-d4f30d1a268a51ee74c98f6ae0f45136274536af.zip | |
Keep separate chain of outer reporters for StoreReporters
Used in rewritten `errorsReported` method. This fixes #866. The problem
before was that `TyperState#trywithFallBack` temporarily updates
the reporter, so crawling up the context chain to check for reporters
with errors missed some reported errors, which triggered the assertion
in `Tree#withType`.
Diffstat (limited to 'src/dotty/tools/dotc/core/TyperState.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/TyperState.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/TyperState.scala b/src/dotty/tools/dotc/core/TyperState.scala index 5617f568a..36f026107 100644 --- a/src/dotty/tools/dotc/core/TyperState.scala +++ b/src/dotty/tools/dotc/core/TyperState.scala @@ -98,7 +98,7 @@ extends TyperState(r) { override def fresh(isCommittable: Boolean): TyperState = - new MutableTyperState(this, new StoreReporter, isCommittable) + new MutableTyperState(this, new StoreReporter(reporter), isCommittable) override def withReporter(reporter: Reporter) = new MutableTyperState(this, reporter, isCommittable) @@ -169,7 +169,7 @@ extends TyperState(r) { * found a better solution. */ override def tryWithFallback[T](op: => T)(fallback: => T)(implicit ctx: Context): T = { - val storeReporter = new StoreReporter + val storeReporter = new StoreReporter(myReporter) val savedReporter = myReporter myReporter = storeReporter val savedConstraint = myConstraint |