Enable explicit nulls for all compile

Author: noti0na1

compiler/src/dotty/tools/dotc/util/GenericHashMap.scala

@@ -133,7 +133,7 @@ abstract class GenericHashMap[Key, Value]
       val v1 = value
       v = v1
       update(key, v1)
-    v.uncheckedNN
+    v
 
   private def addOld(key: Key, value: Value): Unit =
     Stats.record(statsItem("re-enter"))

compiler/src/dotty/tools/dotc/util/HashSet.scala

@@ -84,7 +84,7 @@ class HashSet[T](initialCapacity: Int = 8, capacityMultiple: Int = 2) extends Mu
     var idx = firstIndex(x)
     var e: T | Null = entryAt(idx)
     while e != null do
-      if isEqual(e.uncheckedNN, x) then return e
+      if isEqual(e, x) then return e
       idx = nextIndex(idx)
       e = entryAt(idx)
     null
@@ -102,8 +102,7 @@ class HashSet[T](initialCapacity: Int = 8, capacityMultiple: Int = 2) extends Mu
     var idx = firstIndex(x)
     var e: T | Null = entryAt(idx)
     while e != null do
-      // TODO: remove uncheckedNN when explicit-nulls is enabled for regule compiling
-      if isEqual(e.uncheckedNN, x) then return e.uncheckedNN
+      if isEqual(e, x) then return e
       idx = nextIndex(idx)
       e = entryAt(idx)
     addEntryAt(idx, x)
@@ -115,20 +114,20 @@ class HashSet[T](initialCapacity: Int = 8, capacityMultiple: Int = 2) extends Mu
     var idx = firstIndex(x)
     var e: T | Null = entryAt(idx)
     while e != null do
-      if isEqual(e.uncheckedNN, x) then
+      if isEqual(e, x) then
         var hole = idx
         while
           idx = nextIndex(idx)
           e = entryAt(idx)
           e != null
         do
-          val eidx = index(hash(e.uncheckedNN))
+          val eidx = index(hash(e))
           if isDense
             || index(eidx - (hole + 1)) > index(idx - (hole + 1))
                // entry `e` at `idx` can move unless `index(hash(e))` is in
                // the (ring-)interval [hole + 1 .. idx]
           then
-            setEntry(hole, e.uncheckedNN)
+            setEntry(hole, e)
             hole = idx
         table(hole) = null
         used -= 1
@@ -156,7 +155,7 @@ class HashSet[T](initialCapacity: Int = 8, capacityMultiple: Int = 2) extends Mu
       var idx = 0
       while idx < oldTable.length do
         val e: T | Null = oldTable(idx).asInstanceOf[T | Null]
-        if e != null then addOld(e.uncheckedNN)
+        if e != null then addOld(e)
         idx += 1
 
   protected def growTable(): Unit =

compiler/src/dotty/tools/dotc/util/ReadOnlyMap.scala

@@ -15,19 +15,25 @@ abstract class ReadOnlyMap[Key, Value]:
 
   def isEmpty: Boolean = size == 0
 
-  def get(key: Key): Option[Value] = lookup(key) match
-    case null => None
-    case v => Some(v.uncheckedNN)
-
-  def getOrElse(key: Key, value: => Value) = lookup(key) match
-    case null => value
-    case v => v.uncheckedNN
+  def get(key: Key): Option[Value] = 
+    val v = lookup(key) 
+    v match
+      case null => None
+      case _ => Some(v)
+
+  def getOrElse(key: Key, value: => Value) = 
+    val v = lookup(key) 
+    v match
+      case null => value
+      case _ => v
 
   def contains(key: Key): Boolean = lookup(key) != null
 
-  def apply(key: Key): Value = lookup(key) match
-    case null => throw new NoSuchElementException(s"$key")
-    case v => v.uncheckedNN
+  def apply(key: Key): Value = 
+    val v = lookup(key) 
+    v match
+      case null => throw new NoSuchElementException(s"$key")
+      case _ => v
 
   def toArray: Array[(Key, Value)] =
     val result = new Array[(Key, Value)](size)

compiler/src/dotty/tools/dotc/util/WeakHashSet.scala

@@ -178,7 +178,7 @@ abstract class WeakHashSet[A <: AnyRef](initialCapacity: Int = 8, loadFactor: Do
         case null                    => addEntryAt(bucket, elem, h, oldHead)
         case _                       =>
           val entryElem = entry.get
-          if entryElem != null && isEqual(elem, entryElem) then entryElem.uncheckedNN
+          if entryElem != null && isEqual(elem, entryElem) then entryElem
           else linkedListLoop(entry.tail)
       }
 

project/Build.scala

@@ -611,6 +611,9 @@ object Build {
 
       Compile / mainClass := Some("dotty.tools.dotc.Main"),
 
+      // Note: bench/profiles/projects.yml should be updated accordingly.
+      Compile / scalacOptions ++= Seq("-Yexplicit-nulls"),
+
       scala := {
         val args: List[String] = spaceDelimited("<arg>").parsed.toList
         val externalDeps = externalCompilerClasspathTask.value
@@ -773,9 +776,6 @@ object Build {
       )
     },
 
-    // Note: bench/profiles/projects.yml should be updated accordingly.
-    Compile / scalacOptions ++= Seq("-Yexplicit-nulls"),
-
     repl := (Compile / console).value,
     Compile / console / scalacOptions := Nil, // reset so that we get stock REPL behaviour!  E.g. avoid -unchecked being enabled
   )