x

youknowone · youknowone · commit 97bd82144273 · 2026-02-25T17:53:14.000+09:00
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
@@ -545,6 +545,7 @@ def f(cond, true_value, false_value):
         self.assertEqual(len(returns), 2)
         self.check_lnotab(f)
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; absolute jump encoding
     def test_elim_jump_to_uncond_jump(self):
         # POP_JUMP_IF_FALSE to JUMP_FORWARD --> POP_JUMP_IF_FALSE to non-jump
         def f():
@@ -639,12 +640,14 @@ def g()->1+1:
         self.assertNotInBytecode(f, 'BINARY_OP')
         self.check_lnotab(f)
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; no BUILD_LIST to BUILD_TUPLE optimization
     def test_in_literal_list(self):
         def containtest():
             return x in [a, b]
         self.assertEqual(count_instr_recursively(containtest, 'BUILD_LIST'), 0)
         self.check_lnotab(containtest)
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON; no BUILD_LIST to BUILD_TUPLE optimization
     def test_iterate_literal_list(self):
         def forloop():
             for x in [a, b]:
diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs
@@ -703,10 +703,8 @@ impl CodeInfo {
                 if matches!(ins.instr.real(), Some(Instruction::Nop)) {
                     let line = ins.location.line;
                     if prev_line == Some(line) {
-                        // Same line as previous instruction — safe to remove
                         return false;
                     }
-                    // This NOP introduces a new line — keep it
                 }
                 prev_line = Some(ins.location.line);
                 true
diff --git a/crates/compiler-core/src/bytecode.rs b/crates/compiler-core/src/bytecode.rs
@@ -402,8 +402,10 @@ impl CodeUnits {
     /// Replace the opcode at `index` in-place without changing the arg byte.
     ///
     /// # Safety
-    /// Caller must ensure `index` is in bounds and `new_op` has the same
-    /// arg semantics as the original opcode.
+    /// - `index` must be in bounds.
+    /// - `new_op` must have the same arg semantics as the original opcode.
+    /// - The caller must ensure exclusive access to the instruction buffer
+    ///   (no concurrent reads or writes to the same `CodeUnits`).
     pub unsafe fn replace_op(&self, index: usize, new_op: Instruction) {
         unsafe {
             let ptr = self.0.as_ptr() as *mut CodeUnit;
diff --git a/crates/compiler-core/src/bytecode/instruction.rs b/crates/compiler-core/src/bytecode/instruction.rs
@@ -434,7 +434,7 @@ impl Instruction {
     /// Panics if called on an already-instrumented opcode.
     pub fn to_instrumented(self) -> Option<Self> {
         debug_assert!(
-            self.to_base().is_none(),
+            !self.is_instrumented(),
             "to_instrumented called on already-instrumented opcode {self:?}"
         );
         Some(match self {
diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs
@@ -2565,7 +2565,7 @@ impl ExecutingFrame<'_> {
                     }
                 }
             }
-            Instruction::InstrumentedJumpForward => {
+            Instruction::InstrumentedJumpForward | Instruction::InstrumentedJumpBackward => {
                 let src_offset = (self.lasti() - 1) * 2;
                 let target = bytecode::Label::from(u32::from(arg));
                 self.jump(target);
@@ -2574,15 +2574,6 @@ impl ExecutingFrame<'_> {
                 }
                 Ok(None)
             }
-            Instruction::InstrumentedJumpBackward => {
-                let src_offset = (self.lasti() - 1) * 2;
-                let dest = bytecode::Label::from(u32::from(arg));
-                self.jump(dest);
-                if self.monitoring_mask & monitoring::EVENT_JUMP != 0 {
-                    monitoring::fire_jump(vm, self.code, src_offset, dest.0 * 2)?;
-                }
-                Ok(None)
-            }
             Instruction::InstrumentedForIter => {
                 let src_offset = (self.lasti() - 1) * 2;
                 let target = bytecode::Label::from(u32::from(arg));

Original file line number	Diff line number	Diff line change
`@@ -703,10 +703,8 @@ impl CodeInfo {`
`703`	`703`	`if matches!(ins.instr.real(), Some(Instruction::Nop)) {`
`704`	`704`	`let line = ins.location.line;`
`705`	`705`	`if prev_line == Some(line) {`
`706`		`- // Same line as previous instruction — safe to remove`
`707`	`706`	`return false;`
`708`	`707`	`}`
`709`		`- // This NOP introduces a new line — keep it`
`710`	`708`	`}`
`711`	`709`	`prev_line = Some(ins.location.line);`
`712`	`710`	`true`
Original file line number	Diff line number	Diff line change
`@@ -2565,7 +2565,7 @@ impl ExecutingFrame<'_> {`
`2565`	`2565`	`}`
`2566`	`2566`	`}`
`2567`	`2567`	`}`
`2568`		`- Instruction::InstrumentedJumpForward => {`
	`2568`	`+ Instruction::InstrumentedJumpForward \| Instruction::InstrumentedJumpBackward => {`
`2569`	`2569`	`let src_offset = (self.lasti() - 1) * 2;`
`2570`	`2570`	`let target = bytecode::Label::from(u32::from(arg));`
`2571`	`2571`	`self.jump(target);`
`@@ -2574,15 +2574,6 @@ impl ExecutingFrame<'_> {`
`2574`	`2574`	`}`
`2575`	`2575`	`Ok(None)`
`2576`	`2576`	`}`
`2577`		`- Instruction::InstrumentedJumpBackward => {`
`2578`		`- let src_offset = (self.lasti() - 1) * 2;`
`2579`		`- let dest = bytecode::Label::from(u32::from(arg));`
`2580`		`- self.jump(dest);`
`2581`		`- if self.monitoring_mask & monitoring::EVENT_JUMP != 0 {`
`2582`		`- monitoring::fire_jump(vm, self.code, src_offset, dest.0 * 2)?;`
`2583`		`- }`
`2584`		`- Ok(None)`
`2585`		`- }`
`2586`	`2577`	`Instruction::InstrumentedForIter => {`
`2587`	`2578`	`let src_offset = (self.lasti() - 1) * 2;`
`2588`	`2579`	`let target = bytecode::Label::from(u32::from(arg));`