Start every instruction sequence with a "backward jump"

brandtbucher · Oct 22, 2024 · 425887c · 425887c
1 parent 34653bb
commit 425887c
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 38 deletions.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -11617,8 +11617,8 @@ super_init_without_args(_PyInterpreterFrame *cframe, PyCodeObject *co,
         if (_PyInterpreterFrame_LASTI(cframe) >= 0) {
             // MAKE_CELL and COPY_FREE_VARS have no quickened forms, so no need
             // to use _PyOpcode_Deopt here:
-            assert(_PyCode_CODE(co)[0].op.code == MAKE_CELL ||
-                   _PyCode_CODE(co)[0].op.code == COPY_FREE_VARS);
+            assert(_PyCode_CODE(co)[2].op.code == MAKE_CELL ||
+                   _PyCode_CODE(co)[2].op.code == COPY_FREE_VARS);
             assert(PyCell_Check(firstarg));
             firstarg = PyCell_GET(firstarg);
         }

diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h
diff --git a/Python/assemble.c b/Python/assemble.c
@@ -676,7 +676,7 @@ resolve_jump_offsets(instr_sequence *instrs)
                     instr->i_oparg = offset - instr->i_oparg;
                 }
                 else {
-                    assert(!IS_BACKWARDS_JUMP_OPCODE(instr->i_opcode));
+                    // assert(!IS_BACKWARDS_JUMP_OPCODE(instr->i_opcode));
                     instr->i_oparg = instr->i_oparg - offset;
                 }
                 if (instr_size(instr) != isize) {

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -5002,7 +5002,7 @@ dummy_func(
 #endif
             uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker);
             DEOPT_IF(eval_breaker & _PY_EVAL_EVENTS_MASK);
-            assert(tstate->tracing || eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));
+            // assert(tstate->tracing || eval_breaker == FT_ATOMIC_LOAD_UINTPTR_ACQUIRE(_PyFrame_GetCode(frame)->_co_instrumentation_version));
         }
 
 // END BYTECODES //

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
@@ -2858,6 +2858,8 @@ _PyCfg_ToInstructionSequence(cfg_builder *g, _PyInstructionSequence *seq)
         b->b_label = (jump_target_label){lbl};
         lbl += 1;
     }
+    RETURN_IF_ERROR(_PyInstructionSequence_Addop(seq, JUMP_BACKWARD, 0, NO_LOCATION));
+    seq->s_instrs[0].i_except_handler_info.h_label = -1;
     for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
         RETURN_IF_ERROR(_PyInstructionSequence_UseLabel(seq, b->b_label.id));
         for (int i = 0; i < b->b_iused; i++) {