diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2015-11-09 11:30:41 +0100 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2015-11-09 11:30:41 +0100 |
| commit | 8eef182cfab2d4a23924c4478809d6e83bfc0b9b (patch) | |
| tree | c1088ab653cd40f8c9494498d9cbb15464c97677 /src | |
| parent | 8c593779fd49f9085f69b6b5a9fe180ebede801e (diff) | |
| parent | 4d39003f3ca112d03af1e7a51c9e59bf5eb510c5 (diff) | |
| download | dotty-8eef182cfab2d4a23924c4478809d6e83bfc0b9b.tar.gz dotty-8eef182cfab2d4a23924c4478809d6e83bfc0b9b.tar.bz2 dotty-8eef182cfab2d4a23924c4478809d6e83bfc0b9b.zip | |
Merge pull request #899 from dotty-staging/fix-#880
Require outer pointer also for proxies of enclosing classes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dotty/tools/dotc/transform/ExplicitOuter.scala | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/transform/ExplicitOuter.scala b/src/dotty/tools/dotc/transform/ExplicitOuter.scala index 7391f3cec..024247734 100644 --- a/src/dotty/tools/dotc/transform/ExplicitOuter.scala +++ b/src/dotty/tools/dotc/transform/ExplicitOuter.scala @@ -220,9 +220,14 @@ object ExplicitOuter { case id: Ident => id.tpe match { case ref @ TermRef(NoPrefix, _) => - ref.symbol.is(Hoistable) && isOuter(id.symbol.owner.enclosingClass) - // methods will be placed in enclosing class scope by LambdaLift, so they will get - // an outer path then. + if (ref.symbol is Hoistable) + // ref.symbol will be placed in enclosing class scope by LambdaLift, so it might need + // an outer path then. + isOuter(ref.symbol.owner.enclosingClass) + else + // ref.symbol will get a proxy in immediately enclosing class. If this properly + // contains the current class, it needs an outer path. + ctx.owner.enclosingClass.owner.enclosingClass.isContainedIn(ref.symbol.owner) case _ => false } case nw: New => |