From b595a98a5b51f3b328f1d69e6afc56f19129666d Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 29 Mar 2017 18:56:29 +0200 Subject: New unmangling for ExpandedName --- .../dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'compiler/src/dotty/tools/dotc/core/unpickleScala2') diff --git a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala index e4b6faa4b..608c77a8e 100644 --- a/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala +++ b/compiler/src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala @@ -9,7 +9,7 @@ import java.lang.Double.longBitsToDouble import Contexts._, Symbols._, Types._, Scopes._, SymDenotations._, Names._, NameOps._ import StdNames._, Denotations._, NameOps._, Flags._, Constants._, Annotations._ -import NameKinds.Scala2MethodNameKinds +import NameKinds.{Scala2MethodNameKinds, SuperAccessorName, ExpandedName} import dotty.tools.dotc.typer.ProtoTypes.{FunProtoTyped, FunProto} import util.Positions._ import dotty.tools.dotc.ast.{tpd, Trees, untpd}, ast.tpd._ @@ -439,12 +439,12 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas if (name == nme.TRAIT_CONSTRUCTOR) nme.CONSTRUCTOR else name.asTermName.unmangle(Scala2MethodNameKinds) } - if (flags is Scala2ExpandedName) { - name = name.unmangleExpandedName + if ((flags is Scala2ExpandedName) && name.isSimple) { + name = name.unmangle(ExpandedName) flags = flags &~ Scala2ExpandedName } if (flags is Scala2SuperAccessor) { - name = name.asTermName.unmangleSuperName + name = name.asTermName.unmangle(SuperAccessorName) flags = flags &~ Scala2SuperAccessor } -- cgit v1.2.3