gh-136183: Deal with escapes in JIT optimizer's constant evaluator (GH-136184)

2025-07-07 19:35:27 +00:00 · 2025-07-02 14:08:25 +08:00 · 2025-07-02 14:08:25 +08:00 · b3308973e3
commit b3308973e3
parent f41e9c750e
6 changed files with 77 additions and 7 deletions
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@ -2723,9 +2723,6 @@
                PyObject *lhs_o = PyStackRef_AsPyObjectBorrow(lhs);
                PyObject *rhs_o = PyStackRef_AsPyObjectBorrow(rhs);
                assert(_PyEval_BinaryOps[oparg]);
-                stack_pointer[-2] = res;
-                stack_pointer += -1;
-                assert(WITHIN_STACK_BOUNDS());
                PyObject *res_o = _PyEval_BinaryOps[oparg](lhs_o, rhs_o);
                if (res_o == NULL) {
                    JUMP_TO_LABEL(error);
@ -2733,6 +2730,9 @@
                res_stackref = PyStackRef_FromPyObjectSteal(res_o);
                /* End of uop copied from bytecodes for constant evaluation */
                res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
+                stack_pointer[-2] = res;
+                stack_pointer += -1;
+                assert(WITHIN_STACK_BOUNDS());
                break;
            }
            bool lhs_int = sym_matches_type(lhs, &PyLong_Type);