Add EXTENDED_ARG to SKIP_OPS, normalize LOAD_FAST_CHECK and JUMP_BACK…

…WARD_NO_INTERRUPT
RustPython · youknowone · Mar 25, 2026 · Mar 23, 2026 · Mar 23, 2026 · Mar 23, 2026
commit 37d1e037071430f475707b70e025ec8c6e21b42a
diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs
@@ -1987,6 +1987,7 @@ fn duplicate_end_returns(blocks: &mut [Block]) {
     // Check if the last block ends with LOAD_CONST + RETURN_VALUE (the implicit return)
     let last_insts = &blocks[last_block.idx()].instructions;
     // Only apply when the last block is EXACTLY a return-None epilogue
+    // AND the return instructions have no explicit line number (lineno <= 0)
     let is_return_block = last_insts.len() == 2
         && matches!(
             last_insts[0].instr,

diff --git a/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap b/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ands.snap
diff --git a/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap b/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_mixed.snap
diff --git a/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap b/crates/codegen/src/snapshots/rustpython_codegen__compile__tests__if_ors.snap
diff --git a/scripts/dis_dump.py b/scripts/dis_dump.py