diff options
| author | Paul Phillips <paulp@improving.org> | 2011-01-10 19:20:55 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-01-10 19:20:55 +0000 |
| commit | 9558f60e7ae165e10b41f0649535e95fee255199 (patch) | |
| tree | 0763338b0d78a556723a129098bf2680435feb3a /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 059e8be4c78bbc10f31ff9e404d395b7cfaf52f6 (diff) | |
| download | scala-9558f60e7ae165e10b41f0649535e95fee255199.tar.gz scala-9558f60e7ae165e10b41f0649535e95fee255199.tar.bz2 scala-9558f60e7ae165e10b41f0649535e95fee255199.zip | |
A test case for recently fixed #4114. Plus!
I had closed #2441 as a duplicate of that, but unfortunately #4114 did
not bring #2441 along with it. Then I realized I'm a programmer, not a
helpless trac watcher. As is often the case with thes things, fixing
that revealed a bug in the library. Closes #2441 for real, review by
odersky.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 7788ff489c..2b6bf6080c 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -366,11 +366,12 @@ trait Typers extends Modes { def checkNoEscape(sym: Symbol) { if (sym.isPrivate && !sym.hasFlag(SYNTHETIC_PRIVATE)) { var o = owner - while (o != NoSymbol && o != sym.owner && - !o.isLocal && !o.hasFlag(PRIVATE) && + while (o != NoSymbol && o != sym.owner && o != sym.owner.linkedClassOfClass && + !o.isLocal && !o.isPrivate && !o.privateWithin.hasTransOwner(sym.owner)) o = o.owner - if (o == sym.owner) addHidden(sym) + if (o == sym.owner || o == sym.owner.linkedClassOfClass) + addHidden(sym) } else if (sym.owner.isTerm && !sym.isTypeParameterOrSkolem) { var e = scope.lookupEntry(sym.name) var found = false |