@@ -401,7 +401,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
401401 else { // need to create a new flag
402402 offsetSymbol = newSymbol(claz, offsetById, Synthetic , defn.LongType ).enteredAfter(this )
403403 offsetSymbol.addAnnotation(Annotation (defn.ScalaStaticAnnot ))
404- val flagName = s " ${ StdNames .nme. BITMAP_PREFIX }$id " . toTermName
404+ val flagName = LazyBitMapName .fresh(id.toString. toTermName)
405405 val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType ).enteredAfter(this )
406406 flag = ValDef (flagSymbol, Literal (Constant (0L )))
407407 val offsetTree = ValDef (offsetSymbol, getOffset.appliedTo(thizClass, Literal (Constant (flagName.toString))))
@@ -411,7 +411,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
411411 case None =>
412412 offsetSymbol = newSymbol(claz, offsetName(0 ), Synthetic , defn.LongType ).enteredAfter(this )
413413 offsetSymbol.addAnnotation(Annotation (defn.ScalaStaticAnnot ))
414- val flagName = s " ${ StdNames .nme. BITMAP_PREFIX } 0 " .toTermName
414+ val flagName = LazyBitMapName .fresh( " 0" .toTermName)
415415 val flagSymbol = newSymbol(claz, flagName, containerFlags, defn.LongType ).enteredAfter(this )
416416 flag = ValDef (flagSymbol, Literal (Constant (0L )))
417417 val offsetTree = ValDef (offsetSymbol, getOffset.appliedTo(thizClass, Literal (Constant (flagName.toString))))
0 commit comments