diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-11-23 19:04:33 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2016-11-24 09:44:24 +0100 |
| commit | 473230c638820b9c1d9cf40c218a5e9fc8caaa9f (patch) | |
| tree | 0105f321719027db5baeaaf8bfad91f6cc4b9ee1 /compiler/src/dotty/tools/dotc/core/Symbols.scala | |
| parent | a72ba85afe9950f573cbced60aa37154ae0040e2 (diff) | |
| download | dotty-473230c638820b9c1d9cf40c218a5e9fc8caaa9f.tar.gz dotty-473230c638820b9c1d9cf40c218a5e9fc8caaa9f.tar.bz2 dotty-473230c638820b9c1d9cf40c218a5e9fc8caaa9f.zip | |
Revert fix to #1701.
Fengyun's original solution was the right one. We cannot NOT
enter a package class into its parent scope, because reloading
the denotation with .member will fail. So we need to enter it and
compensate by adding a clause to `qualifies` in `typedIdent`.
Weirdly, this was noted only when running tasty_bootstrap from
a custom classpath in the new build setup. So it was pretty
tricky to diagnose.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/Symbols.scala')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/Symbols.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/Symbols.scala b/compiler/src/dotty/tools/dotc/core/Symbols.scala index c0427e320..cfd85c49c 100644 --- a/compiler/src/dotty/tools/dotc/core/Symbols.scala +++ b/compiler/src/dotty/tools/dotc/core/Symbols.scala @@ -428,7 +428,7 @@ object Symbols { final def entered(implicit ctx: Context): this.type = { assert(this.owner.isClass, s"symbol ($this) entered the scope of non-class owner ${this.owner}") // !!! DEBUG this.owner.asClass.enter(this) - if (this.is(Module, butNot = Package)) this.owner.asClass.enter(this.moduleClass) + if (this is Module) this.owner.asClass.enter(this.moduleClass) this } |