Skip to content

gh-148604: change ADD_OP(_POP_TOP, ...) to optimize_pop_top in optimizer_bytecodes.c #148619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fidget-Spinner merged 2 commits into from
Apr 15, 2026
+31 −16
Merged

gh-148604: change ADD_OP(_POP_TOP, ...) to optimize_pop_top in optimizer_bytecodes.c #148619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9261a8
gh-148604: change `ADD_OP(_POP_TOP, ...)` to `optimize_pop_top` in `o…
NekoAsakura Apr 15, 2026
a1cf3a8
gh-148604: change `ADD_OP(_POP_TOP, ...)` to `optimize_pop_top` in `o…
NekoAsakura Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Lib/test/test_capi/test_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2642,6 +2642,9 @@ def testfunc(n):
uops = get_opnames(ex)
# When the result of type(...) is known, _CALL_TYPE_1 is decomposed.
self.assertNotIn("_CALL_TYPE_1", uops)
# _CALL_TYPE_1 produces 2 _POP_TOP_NOP (callable and null)
# type(42) is int produces 4 _POP_TOP_NOP
self.assertGreaterEqual(count_ops(ex, "_POP_TOP_NOP"), 6)

def test_call_type_1_result_is_const(self):
def testfunc(n):
Expand Down Expand Up @@ -3453,6 +3456,10 @@ def f(n):
self.assertEqual(res, TIER2_THRESHOLD)
uops = get_opnames(ex)
self.assertNotIn("_LOAD_SPECIAL", uops)
# __enter__/__exit__ produce 2 _POP_TOP_NOP
# x += 1 produces 2 _POP_TOP_NOP
# __exit__()'s None return produces 1 _POP_TOP_NOP
self.assertGreaterEqual(count_ops(ex, "_POP_TOP_NOP"), 5)

def test_store_fast_refcount_elimination(self):
def foo(x):
Expand Down
18 changes: 9 additions & 9 deletions Python/optimizer_bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,13 +1480,13 @@ dummy_func(void) {
next = sym_new_type(ctx, &PyLong_Type);
}

op(_CALL_TYPE_1, (unused, unused, arg -- res, a)) {
op(_CALL_TYPE_1, (callable, null, arg -- res, a)) {
PyObject* type = (PyObject *)sym_get_type(arg);
if (type) {
res = sym_new_const(ctx, type);
ADD_OP(_SWAP, 3, 0);
ADD_OP(_POP_TOP, 0, 0);
ADD_OP(_POP_TOP, 0, 0);
optimize_pop_top(ctx, this_instr, callable);
optimize_pop_top(ctx, this_instr, null);
ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)type);
ADD_OP(_SWAP, 2, 0);
}
Expand All @@ -1509,7 +1509,7 @@ dummy_func(void) {
a = arg;
}

op(_CALL_ISINSTANCE, (unused, unused, instance, cls -- res)) {
op(_CALL_ISINSTANCE, (callable, null, instance, cls -- res)) {
// the result is always a bool, but sometimes we can
// narrow it down to True or False
res = sym_new_type(ctx, &PyBool_Type);
Expand All @@ -1525,10 +1525,10 @@ dummy_func(void) {
out = Py_True;
}
sym_set_const(res, out);
ADD_OP(_POP_TOP, 0, 0);
ADD_OP(_POP_TOP, 0, 0);
ADD_OP(_POP_TOP_NOP, 0, 0);
ADD_OP(_POP_TOP, 0, 0);
optimize_pop_top(ctx, this_instr, cls);
optimize_pop_top(ctx, this_instr, instance);
optimize_pop_top(ctx, this_instr, null);
optimize_pop_top(ctx, this_instr, callable);
ADD_OP(_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)out);
}
}
Expand Down Expand Up @@ -1902,7 +1902,7 @@ dummy_func(void) {
ADD_OP(immortal ? _LOAD_CONST_INLINE_BORROW : _LOAD_CONST_INLINE,
0, (uintptr_t)descr);
ADD_OP(_SWAP, 3, 0);
ADD_OP(_POP_TOP, 0, 0);
optimize_pop_top(ctx, this_instr, method_and_self[0]);
if ((type->tp_flags & Py_TPFLAGS_IMMUTABLETYPE) == 0) {
PyType_Watch(TYPE_WATCHER_ID, (PyObject *)type);
_Py_BloomFilter_Add(dependencies, type);
Expand Down
22 changes: 15 additions & 7 deletions Python/optimizer_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading