Seperate between scope exit & unconditional jump opcodes

ShaharNaveh · ShaharNaveh · commit 2ee48bc5aa0b · 2026-01-23T14:25:03.000+02:00
diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs
@@ -439,7 +439,7 @@ impl CodeInfo {
         for block in &mut self.blocks {
             let mut last_instr = None;
             for (i, ins) in block.instructions.iter().enumerate() {
-                if ins.instr.unconditional_branch() {
+                if ins.instr.is_scope_exit() || ins.instr.is_unconditional_jump() {
                     last_instr = Some(i);
                     break;
                 }
@@ -545,7 +545,7 @@ impl CodeInfo {
                     );
                 }
                 depth = new_depth;
-                if instr.unconditional_branch() {
+                if instr.is_scope_exit() || instr.is_unconditional_jump() {
                     continue 'process_blocks;
                 }
             }
diff --git a/crates/compiler-core/src/bytecode/instruction.rs b/crates/compiler-core/src/bytecode/instruction.rs
@@ -432,15 +432,19 @@ impl InstructionMetadata for Instruction {
         }
     }
 
-    fn unconditional_branch(&self) -> bool {
+    fn is_unconditional_jump(&self) -> bool {
         matches!(
             self,
             Self::JumpForward { .. }
                 | Self::JumpBackward { .. }
                 | Self::JumpBackwardNoInterrupt { .. }
-                | Self::ReturnValue
-                | Self::RaiseVarargs { .. }
-                | Self::Reraise { .. }
+        )
+    }
+
+    fn is_scope_exit(&self) -> bool {
+        matches!(
+            self,
+            Self::ReturnValue | Self::RaiseVarargs { .. } | Self::Reraise { .. }
         )
     }
 
@@ -997,7 +1001,11 @@ impl InstructionMetadata for PseudoInstruction {
         }
     }
 
-    fn unconditional_branch(&self) -> bool {
+    fn is_scope_exit(&self) -> bool {
+        false
+    }
+
+    fn is_unconditional_jump(&self) -> bool {
         matches!(self, Self::Jump { .. } | Self::JumpNoInterrupt { .. })
     }
 
@@ -1085,7 +1093,9 @@ macro_rules! inst_either {
 impl InstructionMetadata for AnyInstruction {
     inst_either!(fn label_arg(&self) -> Option<Arg<Label>>);
 
-    inst_either!(fn unconditional_branch(&self) -> bool);
+    inst_either!(fn is_unconditional_jump(&self) -> bool);
+
+    inst_either!(fn is_scope_exit(&self) -> bool);
 
     inst_either!(fn stack_effect(&self, arg: OpArg) -> i32);
 
@@ -1142,16 +1152,9 @@ pub trait InstructionMetadata {
     /// Gets the label stored inside this instruction, if it exists.
     fn label_arg(&self) -> Option<Arg<Label>>;
 
-    /// Whether this is an unconditional branching.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use rustpython_compiler_core::bytecode::{Arg, Instruction, InstructionMetadata};
-    /// let jump_inst = Instruction::JumpForward { target: Arg::marker() };
-    /// assert!(jump_inst.unconditional_branch())
-    /// ```
-    fn unconditional_branch(&self) -> bool;
+    fn is_scope_exit(&self) -> bool;
+
+    fn is_unconditional_jump(&self) -> bool;
 
     /// What effect this instruction has on the stack
     ///

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ impl CodeInfo {`
`439`	`439`	`for block in &mut self.blocks {`
`440`	`440`	`let mut last_instr = None;`
`441`	`441`	`for (i, ins) in block.instructions.iter().enumerate() {`
`442`		`- if ins.instr.unconditional_branch() {`
	`442`	`+ if ins.instr.is_scope_exit() \|\| ins.instr.is_unconditional_jump() {`
`443`	`443`	`last_instr = Some(i);`
`444`	`444`	`break;`
`445`	`445`	`}`
`@@ -545,7 +545,7 @@ impl CodeInfo {`
`545`	`545`	`);`
`546`	`546`	`}`
`547`	`547`	`depth = new_depth;`
`548`		`- if instr.unconditional_branch() {`
	`548`	`+ if instr.is_scope_exit() \|\| instr.is_unconditional_jump() {`
`549`	`549`	`continue 'process_blocks;`
`550`	`550`	`}`
`551`	`551`	`}`