Skip to content

Commit c038bd2

Browse files
committed
Fix #2437: Drop erroneous case ib Pickler
The case was a left-over from when we did not pickle types as trees. There was a special case to record the symbol of a bound type variable. This is no longer needed as we now pickle the full tree that defines the symbol.
1 parent abad0ad commit c038bd2

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -148,32 +148,21 @@ class TreePickler(pickler: TastyPickler) {
148148
pickleType(tpe.superType)
149149
case tpe: WithFixedSym =>
150150
val sym = tpe.symbol
151-
def pickleRef() =
152-
if (tpe.prefix == NoPrefix) {
153-
writeByte(if (tpe.isType) TYPEREFdirect else TERMREFdirect)
154-
pickleSymRef(sym)
155-
}
156-
else {
157-
assert(tpe.symbol.isClass)
158-
assert(tpe.symbol.is(Flags.Scala2x), tpe.symbol.showLocated)
159-
writeByte(TYPEREF) // should be changed to a new entry that keeps track of prefix, symbol & owner
160-
pickleName(tpe.name)
161-
pickleType(tpe.prefix)
162-
}
163151
if (sym.is(Flags.Package)) {
164152
writeByte(if (tpe.isType) TYPEREFpkg else TERMREFpkg)
165153
pickleName(sym.fullName)
166154
}
167-
else if (sym is Flags.BindDefinedType) {
168-
registerDef(sym)
169-
writeByte(BIND)
170-
withLength {
171-
pickleName(sym.name)
172-
pickleType(sym.info)
173-
pickleRef()
174-
}
155+
else if (tpe.prefix == NoPrefix) {
156+
writeByte(if (tpe.isType) TYPEREFdirect else TERMREFdirect)
157+
pickleSymRef(sym)
158+
}
159+
else {
160+
assert(tpe.symbol.isClass)
161+
assert(tpe.symbol.is(Flags.Scala2x), tpe.symbol.showLocated)
162+
writeByte(TYPEREF) // should be changed to a new entry that keeps track of prefix, symbol & owner
163+
pickleName(tpe.name)
164+
pickleType(tpe.prefix)
175165
}
176-
else pickleRef()
177166
case tpe: TermRefWithSignature =>
178167
if (tpe.symbol.is(Flags.Package)) picklePackageRef(tpe.symbol)
179168
else {

0 commit comments

Comments
 (0)