remove uncheckedNN and toOption

Author: hamzaremmal

compiler/src/dotty/tools/backend/jvm/BCodeSyncAndTry.scala

@@ -213,7 +213,7 @@ trait BCodeSyncAndTry extends BCodeBodyBuilder {
       val acquiredStack = if needStackStash then stack.acquireFullStack() else null
       val stashLocals =
         if acquiredStack == null then null
-        else acquiredStack.uncheckedNN.filter(_ != UNIT).map(btpe => locals.makeTempLocal(btpe))
+        else acquiredStack.nn.filter(_ != UNIT).map(btpe => locals.makeTempLocal(btpe))
 
       val hasFinally   = (finalizer != tpd.EmptyTree)
 
@@ -240,7 +240,7 @@ trait BCodeSyncAndTry extends BCodeBodyBuilder {
        */
 
       if stashLocals != null then
-        val stashLocalsNN = stashLocals.uncheckedNN // why is this necessary?
+        val stashLocalsNN = stashLocals.nn // why is this necessary?
         for i <- (stashLocalsNN.length - 1) to 0 by -1 do
           val local = stashLocalsNN(i)
           bc.store(local.idx, local.tk)
@@ -398,7 +398,7 @@ trait BCodeSyncAndTry extends BCodeBodyBuilder {
        */
 
       if stashLocals != null then
-        val stashLocalsNN = stashLocals.uncheckedNN // why is this necessary?
+        val stashLocalsNN = stashLocals.nn // why is this necessary?
 
         val resultLoc =
           if kind == UNIT then null

compiler/src/dotty/tools/dotc/ast/Trees.scala

@@ -75,7 +75,7 @@ object Trees {
      */
     final def tpe: T =
       if myTpe == null then throw UnAssignedTypeException(this)
-      myTpe.uncheckedNN
+      myTpe.nn
 
     /** Copy `tpe` attribute from tree `from` into this tree, independently
      *  whether it is null or not.
@@ -295,7 +295,7 @@ object Trees {
     private var myMods: untpd.Modifiers | Null = uninitialized
 
     private[dotc] def rawMods: untpd.Modifiers =
-      if (myMods == null) untpd.EmptyModifiers else myMods.uncheckedNN
+      if (myMods == null) untpd.EmptyModifiers else myMods.nn
 
     def withAnnotations(annots: List[untpd.Tree]): ThisTree[Untyped] = withMods(rawMods.withAnnotations(annots))
 

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -279,7 +279,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
         val previousParamRefs: ListBuffer[TermRef] =
           // It is ok to assign `null` here.
           // If `isParamDependent == false`, the value of `previousParamRefs` is not used.
-          if isParamDependent then mutable.ListBuffer[TermRef]() else (null: ListBuffer[TermRef] | Null).uncheckedNN
+          if isParamDependent then mutable.ListBuffer[TermRef]() else (null: ListBuffer[TermRef] | Null).nn
 
         def valueParam(name: TermName, origInfo: Type, isErased: Boolean): TermSymbol =
           val maybeImplicit =
@@ -1378,7 +1378,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     def rootTrees(using Context): List[Tree] =
       if (ctx.settings.YretainTrees.value) {
         if (myTrees == null) myTrees = computeRootTrees
-        myTrees.uncheckedNN
+        myTrees.nn
       }
       else computeRootTrees
 

compiler/src/dotty/tools/dotc/cc/Capability.scala

@@ -571,7 +571,7 @@ object Capabilities:
     def singletonCaptureSet(using Context): CaptureSet.Const =
       if mySingletonCaptureSet == null then
         mySingletonCaptureSet = CaptureSet(this)
-      mySingletonCaptureSet.uncheckedNN
+      mySingletonCaptureSet.nn
 
     /** The capture set of the type underlying this reference */
     def captureSetOfInfo(using Context): CaptureSet =

compiler/src/dotty/tools/dotc/core/Contexts.scala

@@ -887,7 +887,7 @@ object Contexts {
     finally ctx.base.comparersInUse = saved
   end comparing
 
-  @sharable val NoContext: Context = new FreshContext((null: ContextBase | Null).uncheckedNN) {
+  @sharable val NoContext: Context = new FreshContext((null: ContextBase | Null).nn) {
     override val implicits: ContextualImplicits = new ContextualImplicits(Nil, null, false)(this: @unchecked)
     setSource(NoSource)
   }

compiler/src/dotty/tools/dotc/core/GadtConstraint.scala

@@ -123,7 +123,7 @@ class GadtConstraint private (
     def apply(tp: Type): Type = externalize(tp, this)(using mapCtx)
 
   def tvarOrError(sym: Symbol)(using Context): TypeVar =
-    mapping(sym).ensuring(_ != null, i"not a constrainable symbol: $sym").uncheckedNN
+    mapping(sym).ensuring(_ != null, i"not a constrainable symbol: $sym").nn
 
   @tailrec final def stripInternalTypeVar(tp: Type): Type = tp match
     case tv: TypeVar =>

compiler/src/dotty/tools/dotc/core/OrderingConstraint.scala

@@ -896,17 +896,17 @@ class OrderingConstraint(private val boundsMap: ParamBounds,
 
   /** The uninstantiated typevars of this constraint */
   def uninstVars: collection.Seq[TypeVar] = {
-    if (myUninstVars == null || myUninstVars.uncheckedNN.exists(_.isPermanentlyInstantiated)) {
+    if (myUninstVars == null || myUninstVars.nn.exists(_.isPermanentlyInstantiated)) {
       myUninstVars = new mutable.ArrayBuffer[TypeVar]
       boundsMap.foreachBinding { (poly, entries) =>
         for (i <- 0 until paramCount(entries))
           typeVar(entries, i) match {
-            case tv: TypeVar if !tv.isPermanentlyInstantiated && isBounds(entries(i)) => myUninstVars.uncheckedNN += tv
+            case tv: TypeVar if !tv.isPermanentlyInstantiated && isBounds(entries(i)) => myUninstVars.nn += tv
             case _ =>
           }
       }
     }
-    myUninstVars.uncheckedNN
+    myUninstVars.nn
   }
 
 // ---------- Checking -----------------------------------------------

compiler/src/dotty/tools/dotc/core/Scopes.scala

@@ -135,7 +135,7 @@ object Scopes {
     final def lookupAll(name: Name)(using Context): Iterator[Symbol] = new Iterator[Symbol] {
       var e = lookupEntry(name)
       def hasNext: Boolean = e != null
-      def next(): Symbol = { val r = e.nn.sym; e = lookupNextEntry(e.uncheckedNN); r }
+      def next(): Symbol = { val r = e.nn.sym; e = lookupNextEntry(e.nn); r }
     }
 
     /** Does this scope contain a reference to `sym` when looking up `name`? */
@@ -180,7 +180,7 @@ object Scopes {
         else
           drop()
       // TODO: improve flow typing to handle this case
-      if result == null then this else result.uncheckedNN
+      if result == null then this else result.nn
 
     def implicitDecls(using Context): List[TermRef] = Nil
 
@@ -257,7 +257,7 @@ object Scopes {
 
     /** create and enter a scope entry with given name and symbol */
     protected def newScopeEntry(name: Name, sym: Symbol)(using Context): ScopeEntry = {
-      ensureCapacity(if (hashTable != null) hashTable.uncheckedNN.length else MinHashedScopeSize)
+      ensureCapacity(if (hashTable != null) hashTable.nn.length else MinHashedScopeSize)
       val e = new ScopeEntry(name, sym, this)
       e.prev = lastEntry
       lastEntry = e
@@ -384,7 +384,7 @@ object Scopes {
           e = e.prev
       }
       if ((e == null) && (synthesize != null)) {
-        val sym = synthesize.uncheckedNN(name)
+        val sym = synthesize.nn(name)
         if (sym.exists) newScopeEntry(sym.name, sym) else e
       }
       else e
@@ -394,9 +394,9 @@ object Scopes {
     override final def lookupNextEntry(entry: ScopeEntry)(using Context): ScopeEntry | Null = {
       var e: ScopeEntry | Null = entry
       if (hashTable != null)
-        while ({ e = e.nn.tail ; (e != null) && e.uncheckedNN.name != entry.name }) ()
+        while ({ e = e.nn.tail ; (e != null) && e.nn.name != entry.name }) ()
       else
-        while ({ e = e.nn.prev ; (e != null) && e.uncheckedNN.name != entry.name }) ()
+        while ({ e = e.nn.prev ; (e != null) && e.nn.name != entry.name }) ()
       e
     }
 

compiler/src/dotty/tools/dotc/core/SymDenotations.scala

@@ -1906,7 +1906,7 @@ object SymDenotations {
       invalidateMemberNamesCache()
 
     def invalidateMemberCachesFor(sym: Symbol)(using Context): Unit =
-      if myMemberCache != null then myMemberCache.uncheckedNN.remove(sym.name)
+      if myMemberCache != null then myMemberCache.nn.remove(sym.name)
       if !sym.flagsUNSAFE.is(Private) then
         invalidateMemberNamesCache()
         if sym.isWrappedToplevelDef then
@@ -2136,7 +2136,7 @@ object SymDenotations {
      */
     def replace(prev: Symbol, replacement: Symbol)(using Context): Unit = {
       unforcedDecls.openForMutations.replace(prev, replacement)
-      if (myMemberCache != null) myMemberCache.uncheckedNN.remove(replacement.name)
+      if (myMemberCache != null) myMemberCache.nn.remove(replacement.name)
     }
 
     /** Delete symbol from current scope.
@@ -2147,7 +2147,7 @@ object SymDenotations {
       val scope = info.decls.openForMutations
       scope.unlink(sym, sym.name)
       if sym.name != sym.originalName then scope.unlink(sym, sym.originalName)
-      if (myMemberCache != null) myMemberCache.uncheckedNN.remove(sym.name)
+      if (myMemberCache != null) myMemberCache.nn.remove(sym.name)
       if (!sym.flagsUNSAFE.is(Private)) invalidateMemberNamesCache()
     }
 
@@ -3040,7 +3040,7 @@ object SymDenotations {
         : (List[ClassSymbol], BaseClassSet) = {
       assert(isValid)
       CyclicReference.trace("compute the base classes of ", clsd.symbol):
-        if cache != null then cache.uncheckedNN
+        if cache != null then cache.nn
         else
           if (locked) throw CyclicReference(clsd)
           locked = true

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -208,7 +208,7 @@ object Symbols extends SymUtils {
 
     /** The symbol's signature if it is completed or a method, NotAMethod otherwise. */
     final def signature(using Context): Signature =
-      if lastDenot.uncheckedNN.isCompleted || lastDenot.uncheckedNN.is(Method) then
+      if lastDenot.nn.isCompleted || lastDenot.nn.is(Method) then
         denot.signature
       else
         Signature.NotAMethod