diff options
author | Martin Odersky <odersky@gmail.com> | 2017-02-18 12:54:36 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2017-02-18 12:55:08 +0100 |
commit | e9fecd393a3c355a68207da4bb1fa9fcf47eafc9 (patch) | |
tree | 15d01361ddacc0cfafd05a7b780677c331c762c3 /compiler/src/dotty/tools/dotc/transform/TreeChecker.scala | |
parent | 6df672c7e7be65d7be1cd6524c610aed4f35178c (diff) | |
download | dotty-e9fecd393a3c355a68207da4bb1fa9fcf47eafc9.tar.gz dotty-e9fecd393a3c355a68207da4bb1fa9fcf47eafc9.tar.bz2 dotty-e9fecd393a3c355a68207da4bb1fa9fcf47eafc9.zip |
Fix #1990: Handle case where inlining changes class of outer
The new situation in the test was that outer of the inlined method
was `A` but it's as seen from type is a subtype `B`.
We need two fixes:
- Ignore outerSelects in TreeChecker. These are treated as having fixed symbols.
- Adapt the outer-path logic to deal with code that's moved to another context.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/transform/TreeChecker.scala')
-rw-r--r-- | compiler/src/dotty/tools/dotc/transform/TreeChecker.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala index b2b99160b..7a4af647f 100644 --- a/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala +++ b/compiler/src/dotty/tools/dotc/transform/TreeChecker.scala @@ -12,6 +12,7 @@ import core.Types._ import core.Flags._ import core.Constants._ import core.StdNames._ +import core.NameOps._ import core.Decorators._ import core.TypeErasure.isErasedType import core.Phases.Phase @@ -336,7 +337,10 @@ class TreeChecker extends Phase with SymTransformer { assert(tree.isTerm || !ctx.isAfterTyper, tree.show + " at " + ctx.phase) val tpe = tree.typeOpt val sym = tree.symbol - if (!tpe.isInstanceOf[WithFixedSym] && sym.exists && !sym.is(Private)) { + if (!tpe.isInstanceOf[WithFixedSym] && + sym.exists && !sym.is(Private) && + !tree.name.isOuterSelect // outer selects have effectively fixed symbols + ) { val qualTpe = tree.qualifier.typeOpt val member = if (sym.is(Private)) qualTpe.member(tree.name) |