PR fixes

pallene-lang · Jul 22, 2024 · ef32c2d · ef32c2d
1 parent 7e924a2
commit ef32c2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/pallene/gc.lua b/src/pallene/gc.lua
@@ -79,7 +79,7 @@ local function flow_analysis(block_list, state_list)
         end
 
         for v, g in pairs(gen) do
-            assert(g ~= true or g ~= kill[v], "gen and kill can't both be true")
+            assert(not (g and kill[v]), "gen and kill can't both be true")
             local previous_val = input[v]
             local new_val = true
             input[v] = new_val
@@ -102,7 +102,7 @@ local function flow_analysis(block_list, state_list)
         end
     end
 
-    local function empty_set(S)
+    local function clear_set(S)
         for v,_ in pairs(S) do
             S[v] = nil
         end
@@ -124,7 +124,7 @@ local function flow_analysis(block_list, state_list)
 
         -- last block's output is supposed to be fixed
         if block_i ~= #block_list then
-            empty_set(state.output)
+            clear_set(state.output)
             for _,succ in ipairs(block_succs) do
                 local succ_in = state_list[succ].input
                 merge_live(succ_in, state.output)
@@ -146,7 +146,7 @@ local function flow_analysis(block_list, state_list)
                 found_dirty_block = true
                 -- CAREFUL: we have to clean the dirty flag BEFORE updating the block or else we
                 -- will do the wrong thing for auto-referencing blocks
-                dirty_flag[block_i] = nil
+                dirty_flag[block_i] = false
                 update_block(block_i)
             end
         end

diff --git a/src/pallene/uninitialized.lua b/src/pallene/uninitialized.lua
@@ -80,7 +80,7 @@ local function flow_analysis(block_list, state_list)
         end
     end
 
-    local function empty_set(S)
+    local function clear_set(S)
         for v,_ in pairs(S) do
             S[v] = nil
         end
@@ -102,7 +102,7 @@ local function flow_analysis(block_list, state_list)
 
         -- first block's input is supposed to be fixed
         if block_i ~= 1 then
-            empty_set(state.input)
+            clear_set(state.input)
             for _,pred in ipairs(block_preds) do
                 local pred_out = state_list[pred].output
                 merge_uninit(state.input, pred_out)
@@ -124,7 +124,7 @@ local function flow_analysis(block_list, state_list)
                 found_dirty_block = true
                 -- CAREFUL: we have to clean the dirty flag BEFORE updating the block or else we
                 -- will do the wrong thing for auto-referencing blocks
-                dirty_flag[block_i] = nil
+                dirty_flag[block_i] = false
                 update_block(block_i)
             end
         end