Skip to content

Pickle/unpickle SuperAccessor names #1165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/dotty/tools/dotc/core/tasty/TreePickler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,22 @@ class TreePickler(pickler: TastyPickler) {
pickleName(TastyName.Signed(nameIndex(name), params.map(fullNameIndex), fullNameIndex(result)))
}

private def pickleName(sym: Symbol)(implicit ctx: Context): Unit =
if (sym is Flags.ExpandedName)
pickleName(TastyName.Expanded(
nameIndex(sym.name.expandedPrefix), nameIndex(sym.name.unexpandedName)))
else pickleName(sym.name)
private def pickleName(sym: Symbol)(implicit ctx: Context): Unit = {
def encodeSuper(name: Name): TastyName.NameRef =
if (sym is Flags.SuperAccessor) {
val SuperAccessorName(n) = name
nameIndex(TastyName.SuperAccessor(nameIndex(n)))
}
else nameIndex(name)
val nameRef =
if (sym is Flags.ExpandedName)
nameIndex(
TastyName.Expanded(
nameIndex(sym.name.expandedPrefix),
encodeSuper(sym.name.unexpandedName)))
else encodeSuper(sym.name)
writeNat(nameRef.index)
}

private def pickleSymRef(sym: Symbol)(implicit ctx: Context) = symRefs.get(sym) match {
case Some(label) =>
Expand Down
10 changes: 7 additions & 3 deletions src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
case Shadowed(original) => toTermName(original).shadowedName
case Expanded(prefix, original) => toTermName(original).expandedName(toTermName(prefix))
case ModuleClass(original) => toTermName(original).moduleClassName.toTermName
case SuperAccessor(accessed) => ???
case SuperAccessor(accessed) => toTermName(accessed).superName
case DefaultGetter(meth, num) => ???
}

Expand Down Expand Up @@ -378,9 +378,13 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
val rhsIsEmpty = noRhs(end)
if (!rhsIsEmpty) skipTree()
val (givenFlags, annots, privateWithin) = readModifiers(end)
val expandedFlag = if (rawName.isInstanceOf[TastyName.Expanded]) ExpandedName else EmptyFlags
def nameFlags(tname: TastyName): FlagSet = tname match {
case TastyName.Expanded(_, original) => ExpandedName | nameFlags(tastyName(original))
case TastyName.SuperAccessor(_) => Flags.SuperAccessor
case _ => EmptyFlags
}
pickling.println(i"creating symbol $name at $start with flags $givenFlags")
val flags = normalizeFlags(tag, givenFlags | expandedFlag, name, isAbstractType, rhsIsEmpty)
val flags = normalizeFlags(tag, givenFlags | nameFlags(rawName), name, isAbstractType, rhsIsEmpty)
def adjustIfModule(completer: LazyType) =
if (flags is Module) ctx.adjustModuleCompleter(completer, name) else completer
val sym =
Expand Down
6 changes: 6 additions & 0 deletions tests/run/i1144/AB_1.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
trait A {
def x = 3
}
trait B extends A {
override def x = super.x * 2
}
3 changes: 3 additions & 0 deletions tests/run/i1144/C_2.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
object Test extends B {
def main(args: Array[String]) = assert(x == 6, x)
}