https://github.com/python/cpython/commit/1fb8e0eb51acca6062a7d57e23055dc28b6a34b7
commit: 1fb8e0eb51acca6062a7d57e23055dc28b6a34b7
branch: main
author: Donghee Na <[email protected]>
committer: Fidget-Spinner <[email protected]>
date: 2026-01-01T17:25:38Z
summary:
gh-134584: Eliminate redundant refcounting from _CALL{_BUILTIN_O,
_METHOD_DESCRIPTOR_O} (GH-143330)
Co-authored-by: Ken Jin <[email protected]>
files:
M Include/internal/pycore_opcode_metadata.h
M Include/internal/pycore_uop_ids.h
M Include/internal/pycore_uop_metadata.h
M Lib/test/test_capi/test_opt.py
M Python/bytecodes.c
M Python/executor_cases.c.h
M Python/generated_cases.c.h
M Python/optimizer_bytecodes.c
M Python/optimizer_cases.c.h
diff --git a/Include/internal/pycore_opcode_metadata.h
b/Include/internal/pycore_opcode_metadata.h
index 424ec337eb8afd..adce512d32941f 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -1125,7 +1125,7 @@ const struct opcode_metadata
_PyOpcode_opcode_metadata[267] = {
[CALL_METHOD_DESCRIPTOR_FAST] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG |
HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = { true, INSTR_FMT_IBC00,
HAS_ARG_FLAG | HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG },
[CALL_METHOD_DESCRIPTOR_NOARGS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG |
HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
- [CALL_METHOD_DESCRIPTOR_O] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG |
HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
+ [CALL_METHOD_DESCRIPTOR_O] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG |
HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG |
HAS_ESCAPES_FLAG },
[CALL_NON_PY_GENERAL] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG |
HAS_EVAL_BREAK_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[CALL_PY_EXACT_ARGS] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG |
HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG },
[CALL_PY_GENERAL] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG | HAS_DEOPT_FLAG
| HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG |
HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG },
@@ -1371,7 +1371,7 @@ _PyOpcode_macro_expansion[256] = {
[CALL_METHOD_DESCRIPTOR_FAST] = { .nuops = 2, .uops = { {
_CALL_METHOD_DESCRIPTOR_FAST, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC_AT_END,
OPARG_REPLACED, 3 } } },
[CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = { .nuops = 2, .uops = { {
_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS, OPARG_SIMPLE, 3 }, {
_CHECK_PERIODIC_AT_END, OPARG_REPLACED, 3 } } },
[CALL_METHOD_DESCRIPTOR_NOARGS] = { .nuops = 2, .uops = { {
_CALL_METHOD_DESCRIPTOR_NOARGS, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC_AT_END,
OPARG_REPLACED, 3 } } },
- [CALL_METHOD_DESCRIPTOR_O] = { .nuops = 2, .uops = { {
_CALL_METHOD_DESCRIPTOR_O, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC_AT_END,
OPARG_REPLACED, 3 } } },
+ [CALL_METHOD_DESCRIPTOR_O] = { .nuops = 5, .uops = { {
_CALL_METHOD_DESCRIPTOR_O, OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 }, {
_POP_TOP, OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 }, {
_CHECK_PERIODIC_AT_END, OPARG_REPLACED, 3 } } },
[CALL_NON_PY_GENERAL] = { .nuops = 3, .uops = { {
_CHECK_IS_NOT_PY_CALLABLE, OPARG_SIMPLE, 3 }, { _CALL_NON_PY_GENERAL,
OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC_AT_END, OPARG_REPLACED, 3 } } },
[CALL_PY_EXACT_ARGS] = { .nuops = 8, .uops = { { _CHECK_PEP_523,
OPARG_SIMPLE, 1 }, { _CHECK_FUNCTION_VERSION, 2, 1 }, {
_CHECK_FUNCTION_EXACT_ARGS, OPARG_SIMPLE, 3 }, { _CHECK_STACK_SPACE,
OPARG_SIMPLE, 3 }, { _CHECK_RECURSION_REMAINING, OPARG_SIMPLE, 3 }, {
_INIT_CALL_PY_EXACT_ARGS, OPARG_SIMPLE, 3 }, { _SAVE_RETURN_OFFSET,
OPARG_SAVE_RETURN_OFFSET, 3 }, { _PUSH_FRAME, OPARG_SIMPLE, 3 } } },
[CALL_PY_GENERAL] = { .nuops = 6, .uops = { { _CHECK_PEP_523,
OPARG_SIMPLE, 1 }, { _CHECK_FUNCTION_VERSION, 2, 1 }, {
_CHECK_RECURSION_REMAINING, OPARG_SIMPLE, 3 }, { _PY_FRAME_GENERAL,
OPARG_SIMPLE, 3 }, { _SAVE_RETURN_OFFSET, OPARG_SAVE_RETURN_OFFSET, 3 }, {
_PUSH_FRAME, OPARG_SIMPLE, 3 } } },
diff --git a/Include/internal/pycore_uop_ids.h
b/Include/internal/pycore_uop_ids.h
index ebeec6387a741a..a7da996a99ae2d 100644
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -422,7 +422,7 @@ extern "C" {
#define _CALL_METHOD_DESCRIPTOR_FAST_r01 616
#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 617
#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 618
-#define _CALL_METHOD_DESCRIPTOR_O_r01 619
+#define _CALL_METHOD_DESCRIPTOR_O_r03 619
#define _CALL_NON_PY_GENERAL_r01 620
#define _CALL_STR_1_r32 621
#define _CALL_TUPLE_1_r32 622
diff --git a/Include/internal/pycore_uop_metadata.h
b/Include/internal/pycore_uop_metadata.h
index 1838dd3f0977b2..8c65565890b557 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -288,7 +288,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_CALL_ISINSTANCE] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG |
HAS_ESCAPES_FLAG,
[_GUARD_CALLABLE_LIST_APPEND] = HAS_DEOPT_FLAG,
[_CALL_LIST_APPEND] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG |
HAS_ERROR_NO_POP_FLAG,
- [_CALL_METHOD_DESCRIPTOR_O] = HAS_ARG_FLAG | HAS_EXIT_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
+ [_CALL_METHOD_DESCRIPTOR_O] = HAS_ARG_FLAG | HAS_EXIT_FLAG |
HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
[_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = HAS_ARG_FLAG |
HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CALL_METHOD_DESCRIPTOR_NOARGS] = HAS_ARG_FLAG | HAS_EXIT_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CALL_METHOD_DESCRIPTOR_FAST] = HAS_ARG_FLAG | HAS_EXIT_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
@@ -2648,7 +2648,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
[_CALL_METHOD_DESCRIPTOR_O] = {
.best = { 0, 0, 0, 0 },
.entries = {
- { 1, 0, _CALL_METHOD_DESCRIPTOR_O_r01 },
+ { 3, 0, _CALL_METHOD_DESCRIPTOR_O_r03 },
{ -1, -1, -1 },
{ -1, -1, -1 },
{ -1, -1, -1 },
@@ -3764,7 +3764,7 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
[_CALL_LIST_APPEND_r13] = _CALL_LIST_APPEND,
[_CALL_LIST_APPEND_r23] = _CALL_LIST_APPEND,
[_CALL_LIST_APPEND_r33] = _CALL_LIST_APPEND,
- [_CALL_METHOD_DESCRIPTOR_O_r01] = _CALL_METHOD_DESCRIPTOR_O,
+ [_CALL_METHOD_DESCRIPTOR_O_r03] = _CALL_METHOD_DESCRIPTOR_O,
[_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01] =
_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
[_CALL_METHOD_DESCRIPTOR_NOARGS_r01] = _CALL_METHOD_DESCRIPTOR_NOARGS,
[_CALL_METHOD_DESCRIPTOR_FAST_r01] = _CALL_METHOD_DESCRIPTOR_FAST,
@@ -4045,7 +4045,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] =
{
[_CALL_METHOD_DESCRIPTOR_NOARGS] = "_CALL_METHOD_DESCRIPTOR_NOARGS",
[_CALL_METHOD_DESCRIPTOR_NOARGS_r01] =
"_CALL_METHOD_DESCRIPTOR_NOARGS_r01",
[_CALL_METHOD_DESCRIPTOR_O] = "_CALL_METHOD_DESCRIPTOR_O",
- [_CALL_METHOD_DESCRIPTOR_O_r01] = "_CALL_METHOD_DESCRIPTOR_O_r01",
+ [_CALL_METHOD_DESCRIPTOR_O_r03] = "_CALL_METHOD_DESCRIPTOR_O_r03",
[_CALL_NON_PY_GENERAL] = "_CALL_NON_PY_GENERAL",
[_CALL_NON_PY_GENERAL_r01] = "_CALL_NON_PY_GENERAL_r01",
[_CALL_STR_1] = "_CALL_STR_1",
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index 3780bdb28c8c44..93433b841740b4 100644
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -2201,7 +2201,8 @@ def test_call_builtin_o(self):
def testfunc(n):
x = 0
for _ in range(n):
- y = abs(1)
+ my_abs = abs
+ y = my_abs(1)
x += y
return x
@@ -2210,7 +2211,26 @@ def testfunc(n):
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_CALL_BUILTIN_O", uops)
- self.assertIn("_POP_TOP", uops)
+ self.assertNotIn("_POP_TOP", uops)
+ self.assertIn("_POP_TOP_NOP", uops)
+
+ def test_call_method_descriptor_o(self):
+ def testfunc(n):
+ x = 0
+ for _ in range(n):
+ y = (1, 2, 3)
+ z = y.count(2)
+ x += z
+ return x
+
+ res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+ self.assertEqual(res, TIER2_THRESHOLD)
+ self.assertIsNotNone(ex)
+ uops = get_opnames(ex)
+ pop_tops = [opname for opname in iter_opnames(ex) if opname ==
"_POP_TOP"]
+ self.assertIn("_CALL_METHOD_DESCRIPTOR_O", uops)
+ self.assertIn("_POP_TOP_NOP", uops)
+ self.assertLessEqual(len(pop_tops), 1)
def test_get_len_with_const_tuple(self):
def testfunc(n):
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index ea09c0645aa39c..0b74a03a4e56d4 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -4170,7 +4170,7 @@ dummy_func(
_CALL_BUILTIN_CLASS +
_CHECK_PERIODIC_AT_END;
- op(_CALL_BUILTIN_O, (callable, self_or_null, args[oparg] -- res, a,
c)) {
+ op(_CALL_BUILTIN_O, (callable, self_or_null, args[oparg] -- res, c,
s)) {
/* Builtin METH_O functions */
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
@@ -4193,8 +4193,8 @@ dummy_func(
if (res_o == NULL) {
ERROR_NO_POP();
}
- a = arg;
c = callable;
+ s = args[0];
INPUTS_DEAD();
res = PyStackRef_FromPyObjectSteal(res_o);
}
@@ -4362,7 +4362,7 @@ dummy_func(
none = PyStackRef_None;
}
- op(_CALL_METHOD_DESCRIPTOR_O, (callable, self_or_null, args[oparg] --
res)) {
+ op(_CALL_METHOD_DESCRIPTOR_O, (callable, self_or_null, args[oparg] --
res, c, s, a)) {
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
int total_args = oparg;
@@ -4390,8 +4390,13 @@ dummy_func(
PyStackRef_AsPyObjectBorrow(arg_stackref));
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
- DECREF_INPUTS();
- ERROR_IF(res_o == NULL);
+ if (res_o == NULL) {
+ ERROR_NO_POP();
+ }
+ c = callable;
+ s = arguments[0];
+ a = arguments[1];
+ INPUTS_DEAD();
res = PyStackRef_FromPyObjectSteal(res_o);
}
@@ -4399,6 +4404,9 @@ dummy_func(
unused/1 +
unused/2 +
_CALL_METHOD_DESCRIPTOR_O +
+ POP_TOP +
+ POP_TOP +
+ POP_TOP +
_CHECK_PERIODIC_AT_END;
op(_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS, (callable,
self_or_null, args[oparg] -- res)) {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 4e8fa34c0b2c0d..adac2914803d46 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -13568,8 +13568,8 @@
_PyStackRef self_or_null;
_PyStackRef callable;
_PyStackRef res;
- _PyStackRef a;
_PyStackRef c;
+ _PyStackRef s;
oparg = CURRENT_OPARG();
args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
@@ -13612,11 +13612,11 @@
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
- a = arg;
c = callable;
+ s = args[0];
res = PyStackRef_FromPyObjectSteal(res_o);
- _tos_cache2 = c;
- _tos_cache1 = a;
+ _tos_cache2 = s;
+ _tos_cache1 = c;
_tos_cache0 = res;
SET_CURRENT_CACHED_VALUES(3);
stack_pointer += -2 - oparg;
@@ -14302,13 +14302,16 @@
break;
}
- case _CALL_METHOD_DESCRIPTOR_O_r01: {
+ case _CALL_METHOD_DESCRIPTOR_O_r03: {
CHECK_CURRENT_CACHED_VALUES(0);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef *args;
_PyStackRef self_or_null;
_PyStackRef callable;
_PyStackRef res;
+ _PyStackRef c;
+ _PyStackRef s;
+ _PyStackRef a;
oparg = CURRENT_OPARG();
args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
@@ -14359,33 +14362,21 @@
stack_pointer = _PyFrame_GetStackPointer(frame);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
- _PyFrame_SetStackPointer(frame, stack_pointer);
- _PyStackRef tmp;
- for (int _i = oparg; --_i >= 0;) {
- tmp = args[_i];
- args[_i] = PyStackRef_NULL;
- PyStackRef_CLOSE(tmp);
- }
- tmp = self_or_null;
- self_or_null = PyStackRef_NULL;
- stack_pointer[-1 - oparg] = self_or_null;
- PyStackRef_XCLOSE(tmp);
- tmp = callable;
- callable = PyStackRef_NULL;
- stack_pointer[-2 - oparg] = callable;
- PyStackRef_CLOSE(tmp);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2 - oparg;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
if (res_o == NULL) {
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
+ c = callable;
+ s = arguments[0];
+ a = arguments[1];
res = PyStackRef_FromPyObjectSteal(res_o);
- _tos_cache0 = res;
- _tos_cache1 = PyStackRef_ZERO_BITS;
- _tos_cache2 = PyStackRef_ZERO_BITS;
- SET_CURRENT_CACHED_VALUES(1);
+ _tos_cache2 = a;
+ _tos_cache1 = s;
+ _tos_cache0 = c;
+ SET_CURRENT_CACHED_VALUES(3);
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer += -1 - oparg;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index e63852aee1134c..6e4ba9e9ece07b 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -2327,8 +2327,8 @@
_PyStackRef self_or_null;
_PyStackRef *args;
_PyStackRef res;
- _PyStackRef a;
_PyStackRef c;
+ _PyStackRef s;
_PyStackRef value;
/* Skip 1 cache entry */
/* Skip 2 cache entries */
@@ -2374,15 +2374,15 @@
if (res_o == NULL) {
JUMP_TO_LABEL(error);
}
- a = arg;
c = callable;
+ s = args[0];
res = PyStackRef_FromPyObjectSteal(res_o);
}
// _POP_TOP
{
- value = c;
+ value = s;
stack_pointer[-2 - oparg] = res;
- stack_pointer[-1 - oparg] = a;
+ stack_pointer[-1 - oparg] = c;
stack_pointer += -oparg;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
@@ -2391,7 +2391,7 @@
}
// _POP_TOP
{
- value = a;
+ value = c;
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
@@ -3613,6 +3613,10 @@
_PyStackRef self_or_null;
_PyStackRef *args;
_PyStackRef res;
+ _PyStackRef c;
+ _PyStackRef s;
+ _PyStackRef a;
+ _PyStackRef value;
/* Skip 1 cache entry */
/* Skip 2 cache entries */
// _CALL_METHOD_DESCRIPTOR_O
@@ -3666,34 +3670,46 @@
stack_pointer = _PyFrame_GetStackPointer(frame);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
- _PyFrame_SetStackPointer(frame, stack_pointer);
- _PyStackRef tmp;
- for (int _i = oparg; --_i >= 0;) {
- tmp = args[_i];
- args[_i] = PyStackRef_NULL;
- PyStackRef_CLOSE(tmp);
- }
- tmp = self_or_null;
- self_or_null = PyStackRef_NULL;
- stack_pointer[-1 - oparg] = self_or_null;
- PyStackRef_XCLOSE(tmp);
- tmp = callable;
- callable = PyStackRef_NULL;
- stack_pointer[-2 - oparg] = callable;
- PyStackRef_CLOSE(tmp);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2 - oparg;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
if (res_o == NULL) {
JUMP_TO_LABEL(error);
}
+ c = callable;
+ s = arguments[0];
+ a = arguments[1];
res = PyStackRef_FromPyObjectSteal(res_o);
}
- // _CHECK_PERIODIC_AT_END
+ // _POP_TOP
{
- stack_pointer[0] = res;
- stack_pointer += 1;
+ value = a;
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer[-1 - oparg] = c;
+ stack_pointer[-oparg] = s;
+ stack_pointer += 1 - oparg;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ }
+ // _POP_TOP
+ {
+ value = s;
+ stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ }
+ // _POP_TOP
+ {
+ value = c;
+ stack_pointer += -1;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_XCLOSE(value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ }
+ // _CHECK_PERIODIC_AT_END
+ {
_PyFrame_SetStackPointer(frame, stack_pointer);
int err = check_periodics(tstate);
stack_pointer = _PyFrame_GetStackPointer(frame);
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 3e37cb81388ae0..aaa786ae5fd724 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -131,7 +131,7 @@ dummy_func(void) {
}
op(_PUSH_NULL, (-- res)) {
- res = sym_new_null(ctx);
+ res = PyJitRef_Borrow(sym_new_null(ctx));
}
op(_GUARD_TOS_INT, (value -- value)) {
@@ -1064,6 +1064,35 @@ dummy_func(void) {
none = sym_new_const(ctx, Py_None);
}
+ op(_CALL_BUILTIN_O, (callable, self_or_null, args[oparg] -- res, c, s)) {
+ res = sym_new_not_null(ctx);
+ c = callable;
+ if (sym_is_not_null(self_or_null)) {
+ args--;
+ s = args[0];
+ }
+ else if (sym_is_null(self_or_null)) {
+ s = args[0];
+ }
+ else {
+ s = sym_new_unknown(ctx);
+ }
+ }
+
+ op(_CALL_METHOD_DESCRIPTOR_O, (callable, self_or_null, args[oparg] -- res,
c, s, a)) {
+ res = sym_new_not_null(ctx);
+ c = callable;
+ if (sym_is_not_null(self_or_null)) {
+ args--;
+ s = args[0];
+ a = args[1];
+ }
+ else {
+ s = sym_new_unknown(ctx);
+ a = sym_new_unknown(ctx);
+ }
+ }
+
op(_GUARD_IS_FALSE_POP, (flag -- )) {
if (sym_is_const(ctx, flag)) {
PyObject *value = sym_get_const(ctx, flag);
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index b043a9493cbd7c..87c2d1a779b990 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -185,7 +185,7 @@
case _PUSH_NULL: {
JitOptRef res;
- res = sym_new_null(ctx);
+ res = PyJitRef_Borrow(sym_new_null(ctx));
CHECK_STACK_BOUNDS(1);
stack_pointer[0] = res;
stack_pointer += 1;
@@ -2764,16 +2764,31 @@
}
case _CALL_BUILTIN_O: {
+ JitOptRef *args;
+ JitOptRef self_or_null;
+ JitOptRef callable;
JitOptRef res;
- JitOptRef a;
JitOptRef c;
+ JitOptRef s;
+ args = &stack_pointer[-oparg];
+ self_or_null = stack_pointer[-1 - oparg];
+ callable = stack_pointer[-2 - oparg];
res = sym_new_not_null(ctx);
- a = sym_new_not_null(ctx);
- c = sym_new_not_null(ctx);
+ c = callable;
+ if (sym_is_not_null(self_or_null)) {
+ args--;
+ s = args[0];
+ }
+ else if (sym_is_null(self_or_null)) {
+ s = args[0];
+ }
+ else {
+ s = sym_new_unknown(ctx);
+ }
CHECK_STACK_BOUNDS(1 - oparg);
stack_pointer[-2 - oparg] = res;
- stack_pointer[-1 - oparg] = a;
- stack_pointer[-oparg] = c;
+ stack_pointer[-1 - oparg] = c;
+ stack_pointer[-oparg] = s;
stack_pointer += 1 - oparg;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
@@ -2912,11 +2927,33 @@
}
case _CALL_METHOD_DESCRIPTOR_O: {
+ JitOptRef *args;
+ JitOptRef self_or_null;
+ JitOptRef callable;
JitOptRef res;
+ JitOptRef c;
+ JitOptRef s;
+ JitOptRef a;
+ args = &stack_pointer[-oparg];
+ self_or_null = stack_pointer[-1 - oparg];
+ callable = stack_pointer[-2 - oparg];
res = sym_new_not_null(ctx);
- CHECK_STACK_BOUNDS(-1 - oparg);
+ c = callable;
+ if (sym_is_not_null(self_or_null)) {
+ args--;
+ s = args[0];
+ a = args[1];
+ }
+ else {
+ s = sym_new_unknown(ctx);
+ a = sym_new_unknown(ctx);
+ }
+ CHECK_STACK_BOUNDS(2 - oparg);
stack_pointer[-2 - oparg] = res;
- stack_pointer += -1 - oparg;
+ stack_pointer[-1 - oparg] = c;
+ stack_pointer[-oparg] = s;
+ stack_pointer[1 - oparg] = a;
+ stack_pointer += 2 - oparg;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
