@@ -289,11 +289,6 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
289
289
}
290
290
}
291
291
292
- def transformMemberDefThreadSafe (x : ValOrDefDef )(using Context ): Thicket = {
293
- assert(! (x.symbol is Mutable ))
294
- transformMemberDefThreadSafeNew(x)
295
- }
296
-
297
292
/**
298
293
* Create a threadsafe lazy accessor equivalent to the following code:
299
294
* ```
@@ -370,7 +365,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
370
365
* @param evaluating a reference to the `Evaluating` runtime object
371
366
* @param nullValued a reference to the `NULL` runtime object
372
367
*/
373
- def mkThreadSafeDefNew (methodSymbol : TermSymbol ,
368
+ def mkThreadSafeDef (methodSymbol : TermSymbol ,
374
369
claz : ClassSymbol ,
375
370
target : Symbol ,
376
371
rhs : Tree ,
@@ -446,10 +441,12 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
446
441
ret
447
442
}
448
443
449
- def transformMemberDefThreadSafeNew (x : ValOrDefDef )(using Context ): Thicket = {
444
+ def transformMemberDefThreadSafe (x : ValOrDefDef )(using Context ): Thicket = {
450
445
import dotty .tools .dotc .core .Types ._
451
446
import dotty .tools .dotc .core .Flags ._
452
447
448
+ assert(! (x.symbol is Mutable ))
449
+
453
450
val runtimeModule = " scala.runtime.LazyVals"
454
451
val tpe = x.tpe.widen.resultType.widen
455
452
val claz = x.symbol.owner.asClass
@@ -502,7 +499,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
502
499
This (claz)
503
500
504
501
val methodSymbol = x.symbol.asTerm
505
- val accessor = mkThreadSafeDefNew (methodSymbol, claz, containerSymbol, x.rhs, tpe, offset, objCas,
502
+ val accessor = mkThreadSafeDef (methodSymbol, claz, containerSymbol, x.rhs, tpe, offset, objCas,
506
503
ref(waiting), evaluating, nullValued, swapOver)
507
504
Thicket (containerTree, accessor)
508
505
}
0 commit comments