diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-11-21 16:47:44 +0100 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2014-11-21 16:47:44 +0100 |
| commit | 3f08b0967fb1d68466aed2182c7451dee7715be3 (patch) | |
| tree | 1560509944959bf3f3c10347c78607a4cca653a4 /src/reflect | |
| parent | 57f36ba4d3029b7a217d39b44f4ee8989fb42aaa (diff) | |
| parent | 652abbacf7b913ef87474df4bcce4fe90aec24a1 (diff) | |
| download | scala-3f08b0967fb1d68466aed2182c7451dee7715be3.tar.gz scala-3f08b0967fb1d68466aed2182c7451dee7715be3.tar.bz2 scala-3f08b0967fb1d68466aed2182c7451dee7715be3.zip | |
Merge pull request #4099 from retronym/ticket/7596
SI-7596 Curtail overloaded symbols during unpickling
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/pickling/UnPickler.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala index 5433bfad60..a35620a994 100644 --- a/src/reflect/scala/reflect/internal/pickling/UnPickler.scala +++ b/src/reflect/scala/reflect/internal/pickling/UnPickler.scala @@ -396,7 +396,7 @@ abstract class UnPickler { case NOtpe => NoType case NOPREFIXtpe => NoPrefix case THIStpe => ThisType(readSymbolRef()) - case SINGLEtpe => SingleType(readTypeRef(), readSymbolRef()) + case SINGLEtpe => SingleType(readTypeRef(), readSymbolRef().filter(_.isStable)) // SI-7596 account for overloading case SUPERtpe => SuperType(readTypeRef(), readTypeRef()) case CONSTANTtpe => ConstantType(readConstantRef()) case TYPEREFtpe => TypeRef(readTypeRef(), readSymbolRef(), readTypes()) |