Skip to content

[3.15] gh-149481: skip FOR_ITER inline specialization for Python __next__ (GH-149491) #149523

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
savannahostrowski merged 1 commit into from
May 8, 2026
Merged

[3.15] gh-149481: skip FOR_ITER inline specialization for Python __next__ (GH-149491) #149523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
gh-149481: skip FOR_ITER inline specialization for Python __next__ ( 
GH-149491)

(cherry picked from commit 49918f5)

Co-authored-by: Neko Asakura <neko.asakura@outlook.com>
Co-authored-by: Savannah Ostrowski <savannah@python.org>
Co-authored-by: Stan Ulbrych <stan@python.org>
  • Loading branch information
@NekoAsakura @savannahostrowski
@StanFromIreland @miss-islington
3 people authored and miss-islington committed May 8, 2026
commit 042e695b8d369af4b5b97a9a61dc31a12e7ad0e2
2 changes: 2 additions & 0 deletions Include/internal/pycore_typeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ extern PyObject* _Py_BaseObject_RichCompare(PyObject* self, PyObject* other, int
extern PyObject* _Py_slot_tp_getattro(PyObject *self, PyObject *name);
extern PyObject* _Py_slot_tp_getattr_hook(PyObject *self, PyObject *name);

extern int _PyType_HasSlotTpIternext(PyTypeObject *type);

extern PyTypeObject _PyBufferWrapper_Type;

PyAPI_FUNC(PyObject*) _PySuper_Lookup(PyTypeObject *su_type, PyObject *su_obj,
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_capi/test_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,8 @@ def testfunc(n, m):
ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_ITER_NEXT_INLINE", uops)
self.assertIn("_FOR_ITER_TIER_TWO", uops)
self.assertNotIn("_ITER_NEXT_INLINE", uops)


@requires_specialization
Expand Down
6 changes: 6 additions & 0 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11079,6 +11079,12 @@ slot_tp_iternext(PyObject *self)
return vectorcall_method(&_Py_ID(__next__), stack, 1);
}

int
_PyType_HasSlotTpIternext(PyTypeObject *type)
{
return type->tp_iternext == slot_tp_iternext;
}

static PyObject *
slot_tp_descr_get(PyObject *self, PyObject *obj, PyObject *type)
{
Expand Down
4 changes: 3 additions & 1 deletion Python/optimizer_bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "pycore_long.h"
#include "pycore_opcode_utils.h"
#include "pycore_optimizer.h"
#include "pycore_typeobject.h"
#include "pycore_uops.h"
#include "pycore_uop_ids.h"
#include "internal/pycore_moduleobject.h"
Expand Down Expand Up @@ -1459,7 +1460,8 @@ dummy_func(void) {
type = sym_get_probable_type(iter);
definite = false;
}
if (type != NULL && type != &PyGen_Type && type->tp_iternext != NULL) {
if (type != NULL && type != &PyGen_Type && type->tp_iternext != NULL
&& !_PyType_HasSlotTpIternext(type)) {
PyType_Watch(TYPE_WATCHER_ID, (PyObject *)type);
_Py_BloomFilter_Add(dependencies, type);
if (!definite) {
Expand Down
3 changes: 2 additions & 1 deletion 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