[Sema] add more late init tests

isuckatcs · Jul 5, 2024 · ca22d4f · ca22d4f
1 parent e1cfebe
commit ca22d4f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 24 deletions.
diff --git a/src/sema.cpp b/src/sema.cpp
@@ -62,25 +62,18 @@ bool Sema::checkReturnOnAllPaths(const ResolvedFunctionDecl &fn,
 
 bool Sema::checkVariableInitialization(const ResolvedFunctionDecl &fn,
                                        const CFG &cfg) {
-
   enum class State { Bottom, Unassigned, Assigned, Top };
 
   auto joinStates = [](State s1, State s2) {
-    if (s1 == State::Top)
+    if (s1 == s2)
       return s1;
 
-    if (s2 == State::Top)
-      return s2;
-
     if (s1 == State::Bottom)
       return s2;
 
     if (s2 == State::Bottom)
       return s1;
 
-    if (s1 == s2)
-      return s1;
-
     return State::Top;
   };
 
@@ -97,14 +90,9 @@ bool Sema::checkVariableInitialization(const ResolvedFunctionDecl &fn,
       const auto &[preds, succs, stmts] = cfg.basicBlocks[bb];
 
       Lattice tmp;
-      for (auto &&pred : preds) {
-        for (auto &&[decl, state] : curLattices[pred.first]) {
-          if (tmp.count(decl))
-            tmp[decl] = joinStates(tmp[decl], state);
-          else
-            tmp[decl] = state;
-        }
-      }
+      for (auto &&pred : preds)
+        for (auto &&[decl, state] : curLattices[pred.first])
+          tmp[decl] = joinStates(tmp[decl], state);
 
       auto stmtsReversed = stmts;
       std::reverse(stmtsReversed.begin(), stmtsReversed.end());
@@ -120,11 +108,10 @@ bool Sema::checkVariableInitialization(const ResolvedFunctionDecl &fn,
           const auto *varDecl =
               dynamic_cast<const ResolvedVarDecl *>(assignment->variable->decl);
 
-          if (!varDecl)
-            continue;
+          assert(varDecl &&
+                 "assignment to non-variables should have been caught by sema");
 
-          if (!varDecl->isMutable && tmp.count(varDecl) &&
-              tmp[varDecl] != State::Unassigned)
+          if (!varDecl->isMutable && tmp[varDecl] != State::Unassigned)
             pendingErrors[&assignment->location] =
                 '\'' + varDecl->identifier + "' cannot be mutated";
 
@@ -134,10 +121,7 @@ bool Sema::checkVariableInitialization(const ResolvedFunctionDecl &fn,
           const auto *varDecl =
               dynamic_cast<const ResolvedVarDecl *>(declRefExpr->decl);
 
-          if (!varDecl || !tmp.count(varDecl))
-            continue;
-
-          if (tmp[varDecl] != State::Assigned)
+          if (varDecl && tmp[varDecl] != State::Assigned)
             pendingErrors[&declRefExpr->location] =
                 '\'' + varDecl->identifier + "' is not initialized";
         }

diff --git a/test/sema/late_init.al b/test/sema/late_init.al
@@ -116,3 +116,29 @@ fn shadowInitialized(): void {
 
     x;
 }
+
+fn nestedInLoop(param: number): void {
+    var x: number;
+
+    if param {
+        while param {
+            if param {
+                x = param - 1.0;
+            }
+
+            // CHECK: [[# @LINE + 1 ]]:25: error: 'x' is not initialized
+            var y: number = x;
+        }
+    } else {
+        while param {
+            if param {
+                x = param - 1.0;
+            }
+
+            // CHECK: [[# @LINE + 1 ]]:25: error: 'x' is not initialized
+            var y: number = x;
+        }
+    }
+
+    x + x;
+}