Address review

Author: Fidget-Spinner

Include/internal/pycore_opcode_metadata.h

@@ -3792,6 +3792,67 @@ def __next__(self):
         """), PYTHON_JIT="1", PYTHON_JIT_STRESS="1")
         self.assertEqual(result[0].rc, 0, result)
 
+    def test_143820(self):
+        # https://github.com/python/cpython/issues/143358
+
+        result = script_helper.run_python_until_end('-c', textwrap.dedent(f"""
+        import sys
+        import random
+        
+        int_v1 = 981679
+        int_v2 = -3791744241805517
+        any_v3 = 939.217
+        
+        def f1(): int_v1 ^ int_v1
+        
+        for i_f1 in range(300):
+            f1()
+        
+        def f2():
+            class Int(int):
+                def __index__(self):...
+        
+            inf = float('inf')
+            nzero = -0
+            zero = 0.0
+            dummy = 0
+            print('', file=sys.stderr)
+        
+            def f_0_dc_6103(p): return p + 1
+            def f_1_dc_6103(p): return f_0_dc_6103(p) + 1
+            def f_2_dc_6103(p): return f_1_dc_6103(p) + 1
+            def f_3_dc_6103(p): return f_2_dc_6103(p) + 1
+            def f_4_dc_6103(p): return f_3_dc_6103(p) + 1
+            def f_5_dc_6103(p): return f_4_dc_6103(p) + 1
+            def f_6_dc_6103(p): return f_5_dc_6103(p) + 1
+            def f_7_dc_6103(p): return f_6_dc_6103(p) + 1
+            def f_8_dc_6103(p): return f_7_dc_6103(p) + 1
+            def f_9_dc_6103(p): return f_8_dc_6103(p) + 1
+        
+            if inf == inf: dummy += 1
+            s = ''
+            try:
+                for _ in range(10):
+                    s += ''
+                s += 'y'
+            except Exception: pass
+            int_v1 ^ int_v1
+            int_v1 ^ int_v1
+            int_v1 ^ int_v1
+            int_v2 - int_v1
+            int_v2 - int_v1
+            int_v2 - int_v1
+            int_v2 - int_v1
+            int_v2 - int_v1
+            not any_v3
+            not any_v3
+            not any_v3
+        
+        for i_f2 in range(300):
+            f2()
+        """), PYTHON_JIT="1", PYTHON_JIT_STRESS="1")
+        self.assertEqual(result[0].rc, 0, result)
+
 def global_identity(x):
     return x
 

Include/internal/pycore_uop_metadata.h

@@ -416,8 +416,15 @@
                 assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(right)));
                 int next_oparg;
                 #if TIER_ONE
-                assert(next_instr->op.code == STORE_FAST);
                 next_oparg = next_instr->op.arg;
+                #if _Py_TIER2
+
+                if (next_instr->op.code == ENTER_EXECUTOR) {
+                    _PyExecutorObject *exec = _PyFrame_GetCode(frame)->co_executors->executors[next_oparg];
+                    next_oparg = exec->vm_data.oparg;
+                }
+                #endif
+                assert(next_instr->op.code == STORE_FAST || next_instr->op.code == ENTER_EXECUTOR);
                 #else
                 next_oparg = (int)CURRENT_OPERAND0_16();
                 #endif

Lib/test/test_capi/test_opt.py

@@ -783,13 +783,16 @@ dummy_func(
 
             int next_oparg;
         #if TIER_ONE
-            #if _Py_TIER2
+            next_oparg = next_instr->op.arg;
+#if _Py_TIER2
             // In JIT builds, we might have inserted an executor after this instruction,
             // which breaks this super instruction.
-            DEOPT_IF(next_instr->op.code != STORE_FAST);
-            #endif
-            assert(next_instr->op.code == STORE_FAST);
-            next_oparg = next_instr->op.arg;
+            if (next_instr->op.code == ENTER_EXECUTOR) {
+                _PyExecutorObject *exec = _PyFrame_GetCode(frame)->co_executors->executors[next_oparg];
+                next_oparg = exec->vm_data.oparg;
+            }
+#endif
+            assert(next_instr->op.code == STORE_FAST || next_instr->op.code == ENTER_EXECUTOR);
         #else
             next_oparg = (int)CURRENT_OPERAND0_16();
         #endif