diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-27 18:23:07 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-11 09:33:11 +0200 |
| commit | 21ab9a1355036aa953db4e1f87c8f0f9a06506b5 (patch) | |
| tree | 3824573b541226f7e90609e7163383b471838667 /compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | |
| parent | 0efd6b93cf45be4cb211093185fef2923f53ef67 (diff) | |
| download | dotty-21ab9a1355036aa953db4e1f87c8f0f9a06506b5.tar.gz dotty-21ab9a1355036aa953db4e1f87c8f0f9a06506b5.tar.bz2 dotty-21ab9a1355036aa953db4e1f87c8f0f9a06506b5.zip | |
Get rid of ExpandedName flag
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index c37d60b41..aed0e97f1 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -437,7 +437,10 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas if (name == nme.TRAIT_CONSTRUCTOR) nme.CONSTRUCTOR else name.asTermName.unmangleMethodName } - if (flags is ExpandedName) name = name.unmangleExpandedName + if (flags is Scala2ExpandedName) { + name = name.unmangleExpandedName + flags = flags &~ Scala2ExpandedName + } if (flags is SuperAccessor) name = name.asTermName.unmangleSuperName def isClassRoot = (name == classRoot.name) && (owner == classRoot.owner) && !(flags is ModuleClass) @@ -476,7 +479,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas var flags1 = flags if (flags is TypeParam) { name1 = name1.expandedName(owner) - flags1 |= owner.typeParamCreationFlags | ExpandedName + flags1 |= owner.typeParamCreationFlags } ctx.newSymbol(owner, name1, flags1, localMemberUnpickler, coord = start) case CLASSsym => |