@@ -1215,7 +1215,7 @@ class Definitions {
12151215 val patches = patchCls.info.decls.filter(patch =>
12161216 ! patch.isConstructor && ! patch.isOneOf(PrivateOrSynthetic ))
12171217 for patch <- patches if ! recurse(patch) do
1218- val e : ScopeEntry | Null = scope.lookupEntry(patch.name)
1218+ val e = scope.lookupEntry(patch.name)
12191219 if e != null then scope.unlink(e)
12201220 for patch <- patches do
12211221 patch.ensureCompleted()
@@ -1274,16 +1274,15 @@ class Definitions {
12741274 @ tu lazy val TupleType : Array [TypeRef ] = mkArityArray(" scala.Tuple" , MaxTupleArity , 1 )
12751275
12761276 private class FunType (prefix : String ):
1277- private var classRefs : Array [TypeRef ] = new Array (22 )
1277+ private var classRefs : Array [TypeRef | Null ] = new Array (22 )
12781278 def apply (n : Int ): TypeRef =
12791279 while n >= classRefs.length do
1280- val classRefs1 = new Array [TypeRef ](classRefs.length * 2 )
1280+ val classRefs1 = new Array [TypeRef | Null ](classRefs.length * 2 )
12811281 Array .copy(classRefs, 0 , classRefs1, 0 , classRefs.length)
12821282 classRefs = classRefs1
1283- val cr : TypeRef | Null = classRefs(n)
1284- if cr == null then
1283+ if classRefs(n) == null then
12851284 classRefs(n) = requiredClassRef(prefix + n.toString)
1286- classRefs(n)
1285+ classRefs(n).nn
12871286
12881287 private val erasedContextFunType = FunType (" scala.ErasedContextFunction" )
12891288 private val contextFunType = FunType (" scala.ContextFunction" )
@@ -1822,15 +1821,15 @@ class Definitions {
18221821
18231822 @ tu lazy val reservedScalaClassNames : Set [Name ] = syntheticScalaClasses.map(_.name).toSet
18241823
1825- private var isDefnInitialized = false
1824+ private var isInitialized = false
18261825
18271826 def init ()(using Context ): Unit = {
18281827 this .initCtx = ctx
1829- if (! isDefnInitialized ) {
1828+ if (! isInitialized ) {
18301829 // force initialization of every symbol that is synthesized or hijacked by the compiler
18311830 val forced = syntheticCoreClasses ++ syntheticCoreMethods ++ ScalaValueClasses () :+ JavaEnumClass
18321831
1833- isDefnInitialized = true
1832+ isInitialized = true
18341833 }
18351834 addSyntheticSymbolsComments
18361835 }
0 commit comments