@@ -168,16 +168,11 @@ object SymDenotations {
168
168
}
169
169
}
170
170
else
171
- val traceCycles = CyclicReference .isTraced
172
- try
173
- if traceCycles then
174
- CyclicReference .pushTrace(" compute the signature of " , symbol, " " )
171
+ CyclicReference .trace(" compute the signature of " , symbol):
175
172
if myFlags.is(Touched ) then
176
173
throw CyclicReference (this )(using ctx.withOwner(symbol))
177
174
myFlags |= Touched
178
175
atPhase(validFor.firstPhaseId)(completer.complete(this ))
179
- finally
180
- if traceCycles then CyclicReference .popTrace()
181
176
182
177
protected [dotc] def info_= (tp : Type ): Unit = {
183
178
/* // DEBUG
@@ -2992,12 +2987,9 @@ object SymDenotations {
2992
2987
def apply (clsd : ClassDenotation )(implicit onBehalf : BaseData , ctx : Context )
2993
2988
: (List [ClassSymbol ], BaseClassSet ) = {
2994
2989
assert(isValid)
2995
- val traceCycles = CyclicReference .isTraced
2996
- try
2997
- if traceCycles then
2998
- CyclicReference .pushTrace(" compute the base classes of " , clsd.symbol, " " )
2999
- if (cache != null ) cache.uncheckedNN
3000
- else {
2990
+ CyclicReference .trace(" compute the base classes of " , clsd.symbol):
2991
+ if cache != null then cache.uncheckedNN
2992
+ else
3001
2993
if (locked) throw CyclicReference (clsd)
3002
2994
locked = true
3003
2995
provisional = false
@@ -3007,10 +2999,6 @@ object SymDenotations {
3007
2999
if (! provisional) cache = computed
3008
3000
else onBehalf.signalProvisional()
3009
3001
computed
3010
- }
3011
- finally
3012
- if traceCycles then CyclicReference .popTrace()
3013
- addDependent(onBehalf)
3014
3002
}
3015
3003
3016
3004
def sameGroup (p1 : Phase , p2 : Phase ) = p1.sameParentsStartId == p2.sameParentsStartId
0 commit comments