https://github.com/python/cpython/commit/bb03c8bd02ab2e6bce6c3f32869f9ac3bdf595c1
commit: bb03c8bd02ab2e6bce6c3f32869f9ac3bdf595c1
branch: main
author: Sacul <[email protected]>
committer: Fidget-Spinner <[email protected]>
date: 2026-04-08T23:21:37+08:00
summary:
gh-145866: Convert `_CALL_METHOD_DESCRIPTOR_NOARGS` to leave its inputs on the
stack to be cleaned up by _POP_TOP (GH-148227)
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 Modules/_testinternalcapi/test_cases.c.h
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 916f3b8ee863c4..cafbcb64505adc 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -1141,7 +1141,7 @@ const struct opcode_metadata
_PyOpcode_opcode_metadata[267] = {
[CALL_LIST_APPEND] = { true, INSTR_FMT_IBC00, HAS_ARG_FLAG |
HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG |
HAS_ESCAPES_FLAG },
[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 | HAS_RECORDS_VALUE_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 |
HAS_RECORDS_VALUE_FLAG },
+ [CALL_METHOD_DESCRIPTOR_NOARGS] = { 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 | HAS_RECORDS_VALUE_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 | HAS_RECORDS_VALUE_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 |
HAS_RECORDS_VALUE_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 |
HAS_RECORDS_VALUE_FLAG },
@@ -1390,7 +1390,7 @@ _PyOpcode_macro_expansion[256] = {
[CALL_LIST_APPEND] = { .nuops = 6, .uops = { {
_GUARD_CALLABLE_LIST_APPEND, OPARG_SIMPLE, 3 }, { _GUARD_NOS_NOT_NULL,
OPARG_SIMPLE, 3 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 3 }, { _CALL_LIST_APPEND,
OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 }
} },
[CALL_METHOD_DESCRIPTOR_FAST] = { .nuops = 3, .uops = { {
_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST, OPARG_SIMPLE, 3 }, {
_CALL_METHOD_DESCRIPTOR_FAST, OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC_AT_END,
OPARG_REPLACED, 3 } } },
[CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = { .nuops = 4, .uops = { {
_RECORD_CALLABLE, OPARG_SIMPLE, 0 }, {
_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS, OPARG_SIMPLE, 3 }, {
_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS, OPARG_SIMPLE, 3 }, {
_CHECK_PERIODIC_AT_END, OPARG_REPLACED, 3 } } },
- [CALL_METHOD_DESCRIPTOR_NOARGS] = { .nuops = 5, .uops = { {
_RECORD_CALLABLE, OPARG_SIMPLE, 0 }, {
_GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS, OPARG_SIMPLE, 3 }, {
_CHECK_RECURSION_LIMIT, OPARG_SIMPLE, 3 }, { _CALL_METHOD_DESCRIPTOR_NOARGS,
OPARG_SIMPLE, 3 }, { _CHECK_PERIODIC_AT_END, OPARG_REPLACED, 3 } } },
+ [CALL_METHOD_DESCRIPTOR_NOARGS] = { .nuops = 7, .uops = { {
_RECORD_CALLABLE, OPARG_SIMPLE, 0 }, {
_GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS, OPARG_SIMPLE, 3 }, {
_CHECK_RECURSION_LIMIT, OPARG_SIMPLE, 3 }, { _CALL_METHOD_DESCRIPTOR_NOARGS,
OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3
}, { _CHECK_PERIODIC_AT_END, OPARG_REPLACED, 3 } } },
[CALL_METHOD_DESCRIPTOR_O] = { .nuops = 8, .uops = { { _RECORD_CALLABLE,
OPARG_SIMPLE, 0 }, { _GUARD_CALLABLE_METHOD_DESCRIPTOR_O, OPARG_SIMPLE, 3 }, {
_CHECK_RECURSION_LIMIT, OPARG_SIMPLE, 3 }, { _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 = 4, .uops = { { _RECORD_CALLABLE,
OPARG_SIMPLE, 0 }, { _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 = 9, .uops = { { _RECORD_CALLABLE,
OPARG_SIMPLE, 0 }, { _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 } } },
diff --git a/Include/internal/pycore_uop_ids.h
b/Include/internal/pycore_uop_ids.h
index a1664e9791e662..5fcc422749a3d3 100644
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -527,8 +527,8 @@ extern "C" {
#define _CALL_METHOD_DESCRIPTOR_FAST_INLINE_r01 735
#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 736
#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE_r01 737
-#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 738
-#define _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r01 739
+#define _CALL_METHOD_DESCRIPTOR_NOARGS_r03 738
+#define _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r03 739
#define _CALL_METHOD_DESCRIPTOR_O_r03 740
#define _CALL_METHOD_DESCRIPTOR_O_INLINE_r03 741
#define _CALL_NON_PY_GENERAL_r01 742
diff --git a/Include/internal/pycore_uop_metadata.h
b/Include/internal/pycore_uop_metadata.h
index 5e41f8a021d950..f3d334b85a24ba 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -325,8 +325,8 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = HAS_ARG_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE] = HAS_ARG_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS] = HAS_ARG_FLAG | HAS_EXIT_FLAG,
- [_CALL_METHOD_DESCRIPTOR_NOARGS] = HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG,
- [_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE] = HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG,
+ [_CALL_METHOD_DESCRIPTOR_NOARGS] = HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
+ [_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE] = HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
[_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST] = HAS_ARG_FLAG | HAS_EXIT_FLAG,
[_CALL_METHOD_DESCRIPTOR_FAST] = HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG,
[_CALL_METHOD_DESCRIPTOR_FAST_INLINE] = HAS_ARG_FLAG | HAS_ERROR_FLAG |
HAS_ESCAPES_FLAG,
@@ -3049,7 +3049,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
[_CALL_METHOD_DESCRIPTOR_NOARGS] = {
.best = { 0, 0, 0, 0 },
.entries = {
- { 1, 0, _CALL_METHOD_DESCRIPTOR_NOARGS_r01 },
+ { 3, 0, _CALL_METHOD_DESCRIPTOR_NOARGS_r03 },
{ -1, -1, -1 },
{ -1, -1, -1 },
{ -1, -1, -1 },
@@ -3058,7 +3058,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
[_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE] = {
.best = { 0, 0, 0, 0 },
.entries = {
- { 1, 0, _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r01 },
+ { 3, 0, _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r03 },
{ -1, -1, -1 },
{ -1, -1, -1 },
{ -1, -1, -1 },
@@ -4475,8 +4475,8 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
[_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01] =
_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
[_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE_r01] =
_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE,
[_GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS_r00] =
_GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS,
- [_CALL_METHOD_DESCRIPTOR_NOARGS_r01] = _CALL_METHOD_DESCRIPTOR_NOARGS,
- [_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r01] =
_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE,
+ [_CALL_METHOD_DESCRIPTOR_NOARGS_r03] = _CALL_METHOD_DESCRIPTOR_NOARGS,
+ [_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r03] =
_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE,
[_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_r00] =
_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST,
[_CALL_METHOD_DESCRIPTOR_FAST_r01] = _CALL_METHOD_DESCRIPTOR_FAST,
[_CALL_METHOD_DESCRIPTOR_FAST_INLINE_r01] =
_CALL_METHOD_DESCRIPTOR_FAST_INLINE,
@@ -4882,9 +4882,9 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] =
{
[_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE] =
"_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE",
[_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE_r01] =
"_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_INLINE_r01",
[_CALL_METHOD_DESCRIPTOR_NOARGS] = "_CALL_METHOD_DESCRIPTOR_NOARGS",
- [_CALL_METHOD_DESCRIPTOR_NOARGS_r01] =
"_CALL_METHOD_DESCRIPTOR_NOARGS_r01",
+ [_CALL_METHOD_DESCRIPTOR_NOARGS_r03] =
"_CALL_METHOD_DESCRIPTOR_NOARGS_r03",
[_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE] =
"_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE",
- [_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r01] =
"_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r01",
+ [_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r03] =
"_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r03",
[_CALL_METHOD_DESCRIPTOR_O] = "_CALL_METHOD_DESCRIPTOR_O",
[_CALL_METHOD_DESCRIPTOR_O_r03] = "_CALL_METHOD_DESCRIPTOR_O_r03",
[_CALL_METHOD_DESCRIPTOR_O_INLINE] = "_CALL_METHOD_DESCRIPTOR_O_INLINE",
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index 5d512f19b96933..b25c3c4c4e70a6 100644
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -2780,9 +2780,12 @@ def testfunc(n):
self.assertEqual(res, TIER2_THRESHOLD * 5)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
+
self.assertIn("_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE", uops)
self.assertNotIn("_CALL_METHOD_DESCRIPTOR_NOARGS", uops)
self.assertNotIn("_GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS", uops)
+ self.assertGreaterEqual(count_ops(ex, "_POP_TOP"), 5)
+ self.assertGreaterEqual(count_ops(ex, "_POP_TOP"), 3)
def test_call_method_descriptor_fast(self):
def testfunc(n):
diff --git a/Modules/_testinternalcapi/test_cases.c.h
b/Modules/_testinternalcapi/test_cases.c.h
index 45cbc58b085851..4b6a1d29c7b2eb 100644
--- a/Modules/_testinternalcapi/test_cases.c.h
+++ b/Modules/_testinternalcapi/test_cases.c.h
@@ -3970,6 +3970,9 @@
_PyStackRef self_or_null;
_PyStackRef *args;
_PyStackRef res;
+ _PyStackRef c;
+ _PyStackRef s;
+ _PyStackRef value;
/* Skip 1 cache entry */
/* Skip 2 cache entries */
// _GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS
@@ -4031,24 +4034,35 @@
stack_pointer = _PyFrame_GetStackPointer(frame);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
+ if (res_o == NULL) {
+ JUMP_TO_LABEL(error);
+ }
+ c = callable;
+ s = args[0];
+ res = PyStackRef_FromPyObjectSteal(res_o);
+ }
+ // _POP_TOP
+ {
+ value = s;
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer[-1 - oparg] = c;
+ stack_pointer += -oparg;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(self_stackref);
+ PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2 - oparg;
+ }
+ // _POP_TOP
+ {
+ value = c;
+ stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(callable);
+ PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
- if (res_o == NULL) {
- JUMP_TO_LABEL(error);
- }
- res = PyStackRef_FromPyObjectSteal(res_o);
}
// _CHECK_PERIODIC_AT_END
{
- stack_pointer[0] = res;
- stack_pointer += 1;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
int err = check_periodics(tstate);
stack_pointer = _PyFrame_GetStackPointer(frame);
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 18bd7594b41a92..9e887ed84cfe0e 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -4948,7 +4948,7 @@ dummy_func(
EXIT_IF(!Py_IS_TYPE(self, method->d_common.d_type));
}
- op(_CALL_METHOD_DESCRIPTOR_NOARGS, (callable, self_or_null,
args[oparg] -- res)) {
+ op(_CALL_METHOD_DESCRIPTOR_NOARGS, (callable, self_or_null,
args[oparg] -- res, c, s)) {
PyObject *callable_o = PyStackRef_AsPyObjectBorrow(callable);
PyMethodDescrObject *method = (PyMethodDescrObject *)callable_o;
@@ -4963,15 +4963,16 @@ dummy_func(
PyObject *res_o = _PyCFunction_TrampolineCall(cfunc, self, NULL);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
- PyStackRef_CLOSE(self_stackref);
- DEAD(args);
- DEAD(self_or_null);
- PyStackRef_CLOSE(callable);
- ERROR_IF(res_o == NULL);
+ if (res_o == NULL) {
+ ERROR_NO_POP();
+ }
+ c = callable;
+ s = args[0];
+ INPUTS_DEAD();
res = PyStackRef_FromPyObjectSteal(res_o);
}
- tier2 op(_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE, (callable,
args[oparg], cfunc/4 -- res)) {
+ tier2 op(_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE, (callable,
args[oparg], cfunc/4 -- res, c, s)) {
assert(oparg == 1);
_PyStackRef self_stackref = args[0];
PyObject *self = PyStackRef_AsPyObjectBorrow(self_stackref);
@@ -4980,10 +4981,12 @@ dummy_func(
PyObject *res_o = _PyCFunction_TrampolineCall(cfunc_v, self, NULL);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
- PyStackRef_CLOSE(self_stackref);
- DEAD(args);
- PyStackRef_CLOSE(callable);
- ERROR_IF(res_o == NULL);
+ if (res_o == NULL) {
+ ERROR_NO_POP();
+ }
+ c = callable;
+ s = args[0];
+ INPUTS_DEAD();
res = PyStackRef_FromPyObjectSteal(res_o);
}
@@ -4994,6 +4997,8 @@ dummy_func(
_GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS +
_CHECK_RECURSION_LIMIT +
_CALL_METHOD_DESCRIPTOR_NOARGS +
+ POP_TOP +
+ POP_TOP +
_CHECK_PERIODIC_AT_END;
op(_GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST, (callable, self_or_null,
args[oparg] -- callable, self_or_null, args[oparg])) {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 8f4da0c5a4042a..43a70315d81a86 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -17402,13 +17402,15 @@
break;
}
- case _CALL_METHOD_DESCRIPTOR_NOARGS_r01: {
+ case _CALL_METHOD_DESCRIPTOR_NOARGS_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;
oparg = CURRENT_OPARG();
args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
@@ -17428,33 +17430,31 @@
stack_pointer = _PyFrame_GetStackPointer(frame);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(self_stackref);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2 - oparg;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(callable);
- stack_pointer = _PyFrame_GetStackPointer(frame);
if (res_o == NULL) {
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
+ c = callable;
+ s = args[0];
res = PyStackRef_FromPyObjectSteal(res_o);
+ _tos_cache2 = s;
+ _tos_cache1 = c;
_tos_cache0 = res;
- _tos_cache1 = PyStackRef_ZERO_BITS;
- _tos_cache2 = PyStackRef_ZERO_BITS;
- SET_CURRENT_CACHED_VALUES(1);
+ SET_CURRENT_CACHED_VALUES(3);
+ stack_pointer += -2 - oparg;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}
- case _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r01: {
+ case _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE_r03: {
CHECK_CURRENT_CACHED_VALUES(0);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef *args;
_PyStackRef callable;
_PyStackRef res;
+ _PyStackRef c;
+ _PyStackRef s;
oparg = CURRENT_OPARG();
args = &stack_pointer[-oparg];
callable = stack_pointer[-1 - oparg];
@@ -17469,23 +17469,19 @@
stack_pointer = _PyFrame_GetStackPointer(frame);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(self_stackref);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -1 - oparg;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(callable);
- stack_pointer = _PyFrame_GetStackPointer(frame);
if (res_o == NULL) {
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
+ c = callable;
+ s = args[0];
res = PyStackRef_FromPyObjectSteal(res_o);
+ _tos_cache2 = s;
+ _tos_cache1 = c;
_tos_cache0 = res;
- _tos_cache1 = PyStackRef_ZERO_BITS;
- _tos_cache2 = PyStackRef_ZERO_BITS;
- SET_CURRENT_CACHED_VALUES(1);
+ SET_CURRENT_CACHED_VALUES(3);
+ 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 127a45ef591053..c62dc450525860 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -3970,6 +3970,9 @@
_PyStackRef self_or_null;
_PyStackRef *args;
_PyStackRef res;
+ _PyStackRef c;
+ _PyStackRef s;
+ _PyStackRef value;
/* Skip 1 cache entry */
/* Skip 2 cache entries */
// _GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS
@@ -4031,24 +4034,35 @@
stack_pointer = _PyFrame_GetStackPointer(frame);
_Py_LeaveRecursiveCallTstate(tstate);
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
+ if (res_o == NULL) {
+ JUMP_TO_LABEL(error);
+ }
+ c = callable;
+ s = args[0];
+ res = PyStackRef_FromPyObjectSteal(res_o);
+ }
+ // _POP_TOP
+ {
+ value = s;
+ stack_pointer[-2 - oparg] = res;
+ stack_pointer[-1 - oparg] = c;
+ stack_pointer += -oparg;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(self_stackref);
+ PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -2 - oparg;
+ }
+ // _POP_TOP
+ {
+ value = c;
+ stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(callable);
+ PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
- if (res_o == NULL) {
- JUMP_TO_LABEL(error);
- }
- res = PyStackRef_FromPyObjectSteal(res_o);
}
// _CHECK_PERIODIC_AT_END
{
- stack_pointer[0] = res;
- stack_pointer += 1;
- ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_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 e10891bf9697af..f0abdc098dd8f1 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -1407,7 +1407,7 @@ dummy_func(void) {
ctx->frame->is_c_recursion_checked = true;
}
- op(_CALL_METHOD_DESCRIPTOR_NOARGS, (callable, self_or_null, args[oparg] --
res)) {
+ op(_CALL_METHOD_DESCRIPTOR_NOARGS, (callable, self_or_null, args[oparg] --
res, c, s)) {
PyObject *callable_o = sym_get_const(ctx, callable);
if (callable_o && Py_IS_TYPE(callable_o, &PyMethodDescr_Type)
&& sym_is_not_null(self_or_null)) {
@@ -1416,6 +1416,17 @@ dummy_func(void) {
ADD_OP(_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE, oparg + 1,
(uintptr_t)cfunc);
}
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_FAST_WITH_KEYWORDS, (callable, self_or_null,
args[oparg] -- res)) {
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 5c56a9babd889c..6f9b0e6a4d0373 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -4314,9 +4314,13 @@
}
case _CALL_METHOD_DESCRIPTOR_NOARGS: {
+ JitOptRef *args;
JitOptRef self_or_null;
JitOptRef callable;
JitOptRef res;
+ JitOptRef c;
+ JitOptRef s;
+ args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
PyObject *callable_o = sym_get_const(ctx, callable);
@@ -4327,19 +4331,38 @@
ADD_OP(_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE, oparg + 1,
(uintptr_t)cfunc);
}
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];
+ }
+ 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;
+ stack_pointer[-1 - oparg] = c;
+ stack_pointer[-oparg] = s;
+ stack_pointer += 1 - oparg;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}
case _CALL_METHOD_DESCRIPTOR_NOARGS_INLINE: {
JitOptRef res;
+ JitOptRef c;
+ JitOptRef s;
res = sym_new_not_null(ctx);
- CHECK_STACK_BOUNDS(-oparg);
+ c = sym_new_not_null(ctx);
+ s = sym_new_not_null(ctx);
+ CHECK_STACK_BOUNDS(2 - oparg);
stack_pointer[-1 - oparg] = res;
- stack_pointer += -oparg;
+ stack_pointer[-oparg] = c;
+ stack_pointer[1 - oparg] = s;
+ 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]
