Skip to content

Commit 1942e6a

Browse files
committed
Update CALL_BUILTIN_O
1 parent 89e3475 commit 1942e6a

File tree

6 files changed

+19
-16
lines changed

6 files changed

+19
-16
lines changed

Include/internal/pycore_opcode_metadata.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Include/internal/pycore_uop_ids.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Include/internal/pycore_uop_metadata.h

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lib/test/test_capi/test_opt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2132,7 +2132,7 @@ def testfunc(n):
21322132
self.assertIsNotNone(ex)
21332133
uops = get_opnames(ex)
21342134
self.assertIn("_CALL_BUILTIN_O", uops)
2135-
self.assertIn("_POP_TWO", uops)
2135+
self.assertIn("_POP_TOP", uops)
21362136

21372137
def test_get_len_with_const_tuple(self):
21382138
def testfunc(n):

Python/bytecodes.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4206,9 +4206,9 @@ dummy_func(
42064206
PyObject *res_o = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable_o), PyStackRef_AsPyObjectBorrow(arg));
42074207
_Py_LeaveRecursiveCallTstate(tstate);
42084208
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
4209-
INPUTS_DEAD();
42104209
a = arg;
42114210
c = callable;
4211+
INPUTS_DEAD();
42124212
ERROR_IF(res_o == NULL);
42134213
res = PyStackRef_FromPyObjectSteal(res_o);
42144214
}
@@ -4217,7 +4217,8 @@ dummy_func(
42174217
unused/1 +
42184218
unused/2 +
42194219
_CALL_BUILTIN_O +
4220-
_POP_TWO +
4220+
POP_TOP +
4221+
POP_TOP +
42214222
_CHECK_PERIODIC_AT_END;
42224223

42234224
op(_CALL_BUILTIN_FAST, (callable, self_or_null, args[oparg] -- res)) {

Python/generated_cases.c.h

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)