@markshannon I don't think it matters here, but you didn't update inhttps://github.com/python/cpython/pull/132545/filesPy_TAG_BITS to3. It's still1. I know it "technically" doesn't matter because we use a bitshift to zero it out, but we should still update it to be consistent.

Merge branch 'main' into virtual-iterators

f3b9074

markshannon force-pushed thevirtual-iterators branch fromefe465d tof3b9074Compare

May 19, 2025 13:42

markshannon added3 commits

May 20, 2025 16:49

Merge branch 'main' into virtual-iterators

0efab59

Merge branch 'main' into virtual-iterators

a0d814b

Merge branch 'main' into virtual-iterators

5cd55c4

Copy link

MemberAuthor

markshannon commentedMay 22, 2025

@markshannon I don't think it matters here, but you didn't update inhttps://github.com/python/cpython/pull/132545/filesPy_TAG_BITS to3. It's still1. I know it "technically" doesn't matter because we use a bitshift to zero it out, but we should still update it to be consistent.

Fixed in#134244

Merge branch 'main' into virtual-iterators

867bd10

markshannon mentioned this pull request

May 27, 2025

[3.14] GH-128161: Remove redundant GET_ITER from list comprehension code#134778

Merged

iritkatriel reviewed

May 27, 2025

View reviewed changes

Include/internal/pycore_stackref.h Outdated

		static inline _PyStackRef
		PyStackRef_IncrementTaggedIntNoOverflow(_PyStackRef ref)
		{
		assert(ref.bits != (uintptr_t)-1); // Deosn't overflow

Copy link

Member

iritkatrielMay 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I don't understand why you use this condition. Should it not beassert(ref.bits + 4 > ref.bits) or something like that?

markshannon added2 commits

May 27, 2025 12:15

Clarify assert

d9dc597

Checked for tagged ints

d60ef23

iritkatriel reviewed

May 27, 2025

View reviewed changes

Include/internal/pycore_stackref.h Outdated

		return PyCode_Check(PyStackRef_AsPyObjectBorrow(stackref));
		}

		static inline bool
		PyStackRef_FunctionCheck(_PyStackRef stackref)
		{
		if (PyStackRef_IsTaggedInt(stackref)) {
		return false;
		}
		return PyFunction_Check(PyStackRef_AsPyObjectBorrow(stackref));
		}

Copy link

Member

iritkatrielMay 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Would it help to define these via a macro? Something like

#define STACKREF_CHECK_FUNC(T) \    static inline bool \    PyStackRef_ ## T ## Check(_PyStackRef stackref) \        if (PyStackRef_IsTaggedInt(stackref)) { \            return false; \        } \        return Py ## T ## _Check(PyStackRef_AsPyObjectBorrow(stackref)); \    }...STACKREF_CHECK_FUNC(Exception);STACKREF_CHECK_FUNC(Code);STACKREF_CHECK_FUNC(Function);

Copy link

Member

Fidget-SpinnerMay 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I think it might not work when want to define variants ofCheck andCheckExact, though we can always define two macros for that if we go down this route.