@@ -1227,7 +1227,7 @@ class Definitions {
12271227 val patches = patchCls.info.decls.filter(patch =>
12281228 ! patch.isConstructor && ! patch.isOneOf(PrivateOrSynthetic ))
12291229 for patch <- patches if ! recurse(patch) do
1230- val e : ScopeEntry | Null = scope.lookupEntry(patch.name)
1230+ val e = scope.lookupEntry(patch.name)
12311231 if e != null then scope.unlink(e)
12321232 for patch <- patches do
12331233 patch.ensureCompleted()
@@ -1286,16 +1286,15 @@ class Definitions {
12861286 @ tu lazy val TupleType : Array [TypeRef ] = mkArityArray(" scala.Tuple" , MaxTupleArity , 1 )
12871287
12881288 private class FunType (prefix : String ):
1289- private var classRefs : Array [TypeRef ] = new Array (22 )
1289+ private var classRefs : Array [TypeRef | Null ] = new Array (22 )
12901290 def apply (n : Int ): TypeRef =
12911291 while n >= classRefs.length do
1292- val classRefs1 = new Array [TypeRef ](classRefs.length * 2 )
1292+ val classRefs1 = new Array [TypeRef | Null ](classRefs.length * 2 )
12931293 Array .copy(classRefs, 0 , classRefs1, 0 , classRefs.length)
12941294 classRefs = classRefs1
1295- val cr : TypeRef | Null = classRefs(n)
1296- if cr == null then
1295+ if classRefs(n) == null then
12971296 classRefs(n) = requiredClassRef(prefix + n.toString)
1298- classRefs(n)
1297+ classRefs(n).nn
12991298
13001299 private val erasedContextFunType = FunType (" scala.ErasedContextFunction" )
13011300 private val contextFunType = FunType (" scala.ContextFunction" )
@@ -1837,15 +1836,15 @@ class Definitions {
18371836
18381837 @ tu lazy val reservedScalaClassNames : Set [Name ] = syntheticScalaClasses.map(_.name).toSet
18391838
1840- private var isDefnInitialized = false
1839+ private var isInitialized = false
18411840
18421841 def init ()(using Context ): Unit = {
18431842 this .initCtx = ctx
1844- if (! isDefnInitialized ) {
1843+ if (! isInitialized ) {
18451844 // force initialization of every symbol that is synthesized or hijacked by the compiler
18461845 val forced = syntheticCoreClasses ++ syntheticCoreMethods ++ ScalaValueClasses () :+ JavaEnumClass
18471846
1848- isDefnInitialized = true
1847+ isInitialized = true
18491848 }
18501849 addSyntheticSymbolsComments
18511850 }
0 commit comments