refactor

vyperlang · Sep 24, 2024 · ba88b4e · ba88b4e
1 parent e3c3ba4
commit ba88b4e
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/vyper/venom/basicblock.py b/vyper/venom/basicblock.py
@@ -504,14 +504,6 @@ def remove_instruction(self, instruction: IRInstruction) -> None:
     def clear_instructions(self) -> None:
         self.instructions = []
 
-    @property
-    def non_phi_instructions(self) -> Iterator[IRInstruction]:
-        return (inst for inst in self.instructions if inst.opcode != "phi")
-
-    @property
-    def pseudo_instructions(self) -> Iterator[IRInstruction]:
-        return (inst for inst in self.instructions if inst.is_pseudo)
-
     @property
     def phi_instructions(self) -> Iterator[IRInstruction]:
         for inst in self.instructions:
@@ -520,6 +512,10 @@ def phi_instructions(self) -> Iterator[IRInstruction]:
             else:
                 return
 
+    @property
+    def non_phi_instructions(self) -> Iterator[IRInstruction]:
+        return (inst for inst in self.instructions if inst.opcode != "phi")
+
     @property
     def param_instructions(self) -> Iterator[IRInstruction]:
         for inst in self.instructions:
@@ -528,9 +524,13 @@ def param_instructions(self) -> Iterator[IRInstruction]:
             else:
                 return
 
+    @property
+    def pseudo_instructions(self) -> Iterator[IRInstruction]:
+        return (inst for inst in self.instructions if inst.is_pseudo)
+
     @property
     def body_instructions(self) -> Iterator[IRInstruction]:
-        return (inst for inst in self.instructions[:-1] if inst.opcode not in ["phi", "param"])
+        return (inst for inst in self.instructions[:-1] if not inst.is_pseudo)
 
     def replace_operands(self, replacements: dict) -> None:
         """