diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 14:50:30 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 14:58:55 +1000 |
commit | bcd1e4f3a3c7a683bb7cf435ef8163ecaf90f126 (patch) | |
tree | 43fe4ac6958a20f6244e86609345443e99635cad /src | |
parent | 2cfac1a3516850a40728fefd8f808613d2e83f84 (diff) | |
download | scala-bcd1e4f3a3c7a683bb7cf435ef8163ecaf90f126.tar.gz scala-bcd1e4f3a3c7a683bb7cf435ef8163ecaf90f126.tar.bz2 scala-bcd1e4f3a3c7a683bb7cf435ef8163ecaf90f126.zip |
SI-8868 Fix unpickling of local dummy symbols
These pop up as the owner of symbols in annotation arguments,
such as the ones introduced by the names/defaults desugaring.
The first two test cases here motivate the two patches to Unpicker.
The third requires both fixes, but exploits the problem directly,
without using `@deprecated` and named arguments.
See also 14fa7be / SI-8708 for a recently remedied kindred bug.
Diffstat (limited to 'src')
-rw-r--r-- | src/reflect/scala/reflect/internal/pickling/UnPickler.scala | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala index 8d4c3f752f..5433bfad60 100644 --- a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala +++ b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala @@ -243,8 +243,14 @@ abstract class UnPickler { } getOrElse "") } + def localDummy = { + if (nme.isLocalDummyName(name)) + owner.newLocalDummy(NoPosition) + else NoSymbol + } + // (1) Try name. - fromName(name) orElse { + localDummy orElse fromName(name) orElse { // (2) Try with expanded name. Can happen if references to private // symbols are read from outside: for instance when checking the children // of a class. See #1722. @@ -298,6 +304,7 @@ abstract class UnPickler { * (.) ... * (1) `local child` represents local child classes, see comment in Pickler.putSymbol. * Since it is not a member, it should not be entered in the owner's scope. + * (2) Similarly, we ignore local dummy symbols, as seen in SI-8868 */ def shouldEnterInOwnerScope = { sym.owner.isClass && @@ -307,7 +314,8 @@ abstract class UnPickler { !sym.isRefinementClass && !sym.isTypeParameter && !sym.isExistentiallyBound && - sym.rawname != tpnme.LOCAL_CHILD // (1) + sym.rawname != tpnme.LOCAL_CHILD && // (1) + !nme.isLocalDummyName(sym.rawname) // (2) } markFlagsCompleted(sym)(mask = AllFlags) |