@@ -53,7 +53,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
53
53
// I did not have the time to track down what caused the failure.
54
54
// The testing scheme could well have produced a false negative.
55
55
//
56
- // private var stubs: Set[Symbol] = Set()
56
+ // private var stubs: Set[Symbol] = Set()
57
57
58
58
private var roots : Set [SymDenotation ] = null
59
59
@@ -96,7 +96,9 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
96
96
class Completer (reader : TastyReader ) extends LazyType {
97
97
import reader ._
98
98
def complete (denot : SymDenotation )(implicit ctx : Context ): Unit = {
99
- treeAtAddr(currentAddr) = new TreeReader (reader).readIndexedDef()
99
+ treeAtAddr(currentAddr) =
100
+ new TreeReader (reader).readIndexedDef()(
101
+ ctx.withPhaseNoLater(ctx.picklerPhase))// (ctx.withOwner(owner))
100
102
}
101
103
}
102
104
@@ -951,7 +953,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
951
953
class LazyReader [T <: AnyRef ](reader : TreeReader , op : TreeReader => Context => T ) extends Trees .Lazy [T ] with DeferredPosition {
952
954
def complete (implicit ctx : Context ): T = {
953
955
pickling.println(i " starting to read at ${reader.reader.currentAddr}" )
954
- val res = op(reader)(ctx.addMode(Mode .AllowDependentFunctions ))
956
+ val res = op(reader)(ctx.addMode(Mode .AllowDependentFunctions ).withPhaseNoLater(ctx.picklerPhase) )
955
957
normalizePos(res, parentPos)
956
958
res
957
959
}
@@ -960,7 +962,7 @@ class TreeUnpickler(reader: TastyReader, tastyName: TastyName.Table) {
960
962
class LazyAnnotationReader (sym : Symbol , reader : TreeReader )
961
963
extends LazyAnnotation (sym) with DeferredPosition {
962
964
def complete (implicit ctx : Context ) = {
963
- val res = reader.readTerm()
965
+ val res = reader.readTerm()(ctx.withPhaseNoLater(ctx.picklerPhase))
964
966
normalizePos(res, parentPos)
965
967
res
966
968
}
0 commit comments