Error checking on getVar and getVal

Author: q-ata

compiler/src/dotty/tools/dotc/transform/init/Objects.scala

@@ -336,9 +336,12 @@ object Objects:
     def emptyEnv(meth: Symbol)(using Context): Data =
       new LocalEnv(Map.empty, meth, NoEnv)(valsMap = mutable.Map.empty, varsMap = mutable.Map.empty)
 
-    def valValue(x: Symbol)(using data: Data, ctx: Context): Value = data.getVal(x).get
-
-    def varAddr(x: Symbol)(using data: Data, ctx: Context): Heap.Addr = data.getVar(x).get
+    def valValue(x: Symbol)(using data: Data, ctx: Context): Value =
+      data.getVal(x) match
+      case Some(theValue) =>
+        theValue
+      case _ =>
+        Bottom
 
     def getVal(x: Symbol)(using data: Data, ctx: Context): Option[Value] = data.getVal(x)
 
@@ -855,13 +858,16 @@ object Objects:
       if sym.is(Flags.Mutable) then
         // Assume forward reference check is doing a good job
         given Env.Data = env
-        val addr = Env.varAddr(sym)
-        if addr.owner == State.currentObject then
-          Heap.read(addr)
-        else
-          errorReadOtherStaticObject(State.currentObject, addr.owner)
+        Env.getVar(sym) match
+        case Some(addr) =>
+          if addr.owner == State.currentObject then
+            Heap.read(addr)
+          else
+            errorReadOtherStaticObject(State.currentObject, addr.owner)
+            Bottom
+          end if
+        case _ =>
           Bottom
-        end if
       else if sym.isPatternBound then
         // TODO: handle patterns
         Cold
@@ -908,11 +914,13 @@ object Objects:
     Env.resolveEnv(sym.enclosingMethod, thisV, summon[Env.Data]) match
     case Some(thisV -> env) =>
       given Env.Data = env
-      val addr = Env.varAddr(sym)
-      if addr.owner != State.currentObject then
-        errorMutateOtherStaticObject(State.currentObject, addr.owner)
-      else
-        Heap.write(addr, value)
+      Env.getVar(sym) match
+      case Some(addr) =>
+        if addr.owner != State.currentObject then
+          errorMutateOtherStaticObject(State.currentObject, addr.owner)
+        else
+          Heap.write(addr, value)
+      case _ =>
 
     case _ =>
       report.warning("Assigning to variables in outer scope. Calling trace:\n" + Trace.show, Trace.position)