fix compilation from upstream

Fidget-Spinner · Dec 23, 2024 · 2110e09 · 2110e09
1 parent ca98f9e
commit 2110e09
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 14 deletions.
diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -717,13 +717,8 @@ extern void _PyUOpPrint(const _PyUOpInstruction *uop);
 static int
 base_opcode(PyCodeObject *code, int offset)
 {
-    int opcode = _Py_GetBaseOpcode(code, offset);
-    if (opcode == ENTER_EXECUTOR) {
-        int oparg = _PyCode_CODE(code)[offset].op.arg;
-        _PyExecutorObject *ex = code->co_executors->executors[oparg];
-        return ex->vm_data.opcode;
-    }
-    return opcode;
+    _Py_CODEUNIT inst = _Py_GetBaseCodeUnit(code, offset);
+    return inst.op.code;
 }
 #endif
 

diff --git a/Python/optimizer.c b/Python/optimizer.c
@@ -804,7 +804,7 @@ translate_bytecode_to_trace(
                                 DPRINTF(2, "Trace stack underflow\n");
                                 OPT_STAT_INC(trace_stack_underflow);
                                 ADD_TO_TRACE(uop, oparg, 0, target);
-                                if (uop == _RETURN_GENERATOR) {
+                                if (uop == _RETURN_GENERATOR || uop == _RETURN_VALUE) {
                                     ADD_TO_TRACE(_RETURN_OFFSET, 0, 0, 0);
                                 }
                                 else {
@@ -949,6 +949,7 @@ translate_bytecode_to_trace(
     // SKip trunk traces where they are too short, and don't end in a _JUMP_TO_TOP.
     if (first || (progress_needed &&
         trace[trace_length-1].opcode != _JUMP_TO_TOP &&
+        trace[trace_length-1].opcode != _DYNAMIC_EXIT &&
         (trace_length <= UOP_MIN_TRACE_LENGTH ||
         (is_resume_trace && trace_length <= UOP_MIN_TRACE_LENGTH_RESUME)) )) {
         OPT_STAT_INC(trace_too_short);

diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
@@ -702,8 +702,10 @@ dummy_func(void) {
     op(_RETURN_VALUE, (retval -- res)) {
         SAVE_STACK();
         ctx->frame->stack_pointer = stack_pointer;
-        if (frame_pop(ctx)) {
-            goto done;
+        int err = frame_pop(ctx);
+        if (err) {
+            ctx->done = true;
+            break;
         }
         stack_pointer = ctx->frame->stack_pointer;
 
@@ -727,8 +729,10 @@ dummy_func(void) {
     op(_RETURN_GENERATOR, ( -- res)) {
         SYNC_SP();
         ctx->frame->stack_pointer = stack_pointer;
-        if (frame_pop(ctx)) {
-            goto done;
+        int err = frame_pop(ctx);
+        if (err) {
+            ctx->done = true;
+            break;
         }
         stack_pointer = ctx->frame->stack_pointer;
         res = sym_new_unknown(ctx);
@@ -892,6 +896,11 @@ dummy_func(void) {
         ctx->done = true;
     }
 
+    op(_DYNAMIC_EXIT, (exit_p/4 --)) {
+        (void)exit_p;
+        ctx->done = true;
+    }
+
     op(_GUARD_GLOBALS_VERSION_PUSH_KEYS, (version/1 -- globals_keys)) {
         globals_keys = sym_new_unknown(ctx);
         (void)version;

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h