Skip to content

Commit 7c9aa65

Browse files
committed
update inlined version and regen files
1 parent 0848fe3 commit 7c9aa65

6 files changed

Lines changed: 34 additions & 26 deletions

File tree

Include/internal/pycore_uop_ids.h

Lines changed: 2 additions & 2 deletions
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: 4 additions & 4 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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2784,7 +2784,9 @@ def testfunc(n):
27842784
self.assertIn("_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE", uops)
27852785
self.assertNotIn("_CALL_METHOD_DESCRIPTOR_NOARGS", uops)
27862786
self.assertNotIn("_GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS", uops)
2787-
self.assertGreaterEqual(count_ops(ex, "_POP_TOP"), 6)
2787+
self.assertGreaterEqual(count_ops(ex, "_POP_TOP"), 5)
2788+
print(uops)
2789+
self.assertGreaterEqual(count_ops(ex, "_POP_TOP"), 3)
27882790

27892791
def test_call_method_descriptor_fast(self):
27902792
def testfunc(n):

Python/bytecodes.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4972,7 +4972,7 @@ dummy_func(
49724972
res = PyStackRef_FromPyObjectSteal(res_o);
49734973
}
49744974

4975-
tier2 op(_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE, (callable, args[oparg], cfunc/4 -- res)) {
4975+
tier2 op(_CALL_METHOD_DESCRIPTOR_NOARGS_INLINE, (callable, args[oparg], cfunc/4 -- res, c, s)) {
49764976
assert(oparg == 1);
49774977
_PyStackRef self_stackref = args[0];
49784978
PyObject *self = PyStackRef_AsPyObjectBorrow(self_stackref);
@@ -4981,10 +4981,12 @@ dummy_func(
49814981
PyObject *res_o = _PyCFunction_TrampolineCall(cfunc_v, self, NULL);
49824982
_Py_LeaveRecursiveCallTstate(tstate);
49834983
assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL));
4984-
PyStackRef_CLOSE(self_stackref);
4985-
DEAD(args);
4986-
PyStackRef_CLOSE(callable);
4987-
ERROR_IF(res_o == NULL);
4984+
if (res_o == NULL) {
4985+
ERROR_NO_POP();
4986+
}
4987+
c = callable;
4988+
s = args[0];
4989+
INPUTS_DEAD();
49884990
res = PyStackRef_FromPyObjectSteal(res_o);
49894991
}
49904992

Python/executor_cases.c.h

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

Python/optimizer_cases.c.h

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

0 commit comments

Comments
 (0)