add some OrderedSet hygiene

vyperlang · Oct 28, 2023 · 5b43039 · 5b43039
1 parent 9cf815c
commit 5b43039
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/vyper/ir/bb_optimizer.py b/vyper/ir/bb_optimizer.py
@@ -117,7 +117,8 @@ def _reset_liveness(ctx: IRFunction) -> None:
             inst.liveness = OrderedSet()
 
 
-def _calculate_liveness(bb: IRBasicBlock, liveness_visited: set) -> None:
+def _calculate_liveness(bb: IRBasicBlock, liveness_visited: OrderedSet) -> None:
+    assert isinstance(liveness_visited, OrderedSet)
     for out_bb in bb.cfg_out:
         # REVIEW: .get() already defaults to None
         if liveness_visited.get(bb, None) == out_bb:
@@ -132,7 +133,7 @@ def _calculate_liveness(bb: IRBasicBlock, liveness_visited: set) -> None:
 
 def calculate_liveness(ctx: IRFunction) -> None:
     _reset_liveness(ctx)
-    _calculate_liveness(ctx.basic_blocks[0], {})
+    _calculate_liveness(ctx.basic_blocks[0], OrderedSet())
 
 
 @ir_pass

diff --git a/vyper/ir/ir_to_bb_pass.py b/vyper/ir/ir_to_bb_pass.py
@@ -56,7 +56,7 @@ def generate_assembly_experimental(
 
 def convert_ir_basicblock(ir: IRnode) -> IRFunction:
     global_function = IRFunction(IRLabel("global"))
-    _convert_ir_basicblock(global_function, ir, {}, {}, {})
+    _convert_ir_basicblock(global_function, ir, {}, OrderedSet(), {})
 
     for i, bb in enumerate(global_function.basic_blocks):
         if bb.is_terminated is False and i < len(global_function.basic_blocks) - 1:
@@ -230,6 +230,7 @@ def _convert_ir_basicblock(
     variables: OrderedSet,
     allocated_variables: dict[str, IRVariable],
 ) -> Optional[IRVariable]:
+    assert isinstance(variables, OrderedSet)
     global _break_target, _continue_target
 
     frame_info = ir.passthrough_metadata.get("frame_info", None)