gh-123091: Use more _Py_IsImmortalLoose() - #123602
Merged
encukou merged 1 commit intoSep 2, 2024
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
Switch more _Py_IsImmortal(...) assertions to _Py_IsImmortalLoose(...) The remaining calls to _Py_IsImmortal are in free-threaded-only code, initialization of core objects, tests, and guards that fall back to code that works with mortal objects.
encukou
requested review from
1st1,
asvetlov,
gvanrossum,
kumaraditya303 and
willingc
as code owners
September 2, 2024 13:49
Copy link
Copy Markdown
Member
Remaining calls: $ git grep 'assert.*Py_IsImmortal'|grep -v Loose
Include/internal/pycore_stackref.h: assert(_Py_IsImmortal(obj));
Modules/_testcapi/immortal.c: assert(_Py_IsImmortal(object));
Objects/codeobject.c: assert(_Py_IsImmortal(entry->value));
Objects/object.c: assert(!_Py_IsImmortal(op));
Objects/object.c: assert(_Py_IsImmortal(constants[i]));
Objects/structseq.c: assert(_Py_IsImmortal(type));
Objects/typeobject.c: assert(_Py_IsImmortal((PyObject *)self));
Objects/unicodeobject.c: assert(!_Py_IsImmortal(s));
Programs/_testembed.c: assert(_Py_IsImmortal(str1));
Python/crossinterp.c: assert(_Py_IsImmortal((PyObject *)type));
Python/crossinterp.c: assert(_Py_IsImmortal((PyObject *)info->builtin));
Python/optimizer_symbols.c: assert(_Py_IsImmortal(val_42));
Python/optimizer_symbols.c: assert(_Py_IsImmortal(val_43)); |
Sorry, something went wrong.
vstinner
approved these changes
Sep 2, 2024
vstinner
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
LGTM. IMO it should be backported to 3.13.
Sorry, something went wrong.
Copy link
Copy Markdown
|
Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13. |
Sorry, something went wrong.
Copy link
Copy Markdown
|
Sorry, @encukou, I could not cleanly backport this to 3.13 due to a conflict. cherry_picker 57c471a6880956338549380fc5fb35c986937901 3.13 |
Sorry, something went wrong.
encukou
added a commit
to encukou/cpython
that referenced
this pull request
Sep 3, 2024
Switch more _Py_IsImmortal(...) assertions to _Py_IsImmortalLoose(...) The remaining calls to _Py_IsImmortal are in free-threaded-only code, initialization of core objects, tests, and guards that fall back to code that works with mortal objects. (cherry picked from commit 57c471a)
Copy link
Copy Markdown
|
GH-123622 is a backport of this pull request to the 3.13 branch. |
Sorry, something went wrong.
encukou
added a commit
that referenced
this pull request
Sep 3, 2024
Switch more _Py_IsImmortal(...) assertions to _Py_IsImmortalLoose(...) The remaining calls to _Py_IsImmortal are in free-threaded-only code, initialization of core objects, tests, and guards that fall back to code that works with mortal objects. (cherry picked from commit 57c471a)
encukou
added a commit
to encukou/cpython
that referenced
this pull request
Oct 3, 2024
Switch more _Py_IsImmortal(...) assertions to _Py_IsImmortalLoose(...) The remaining calls to _Py_IsImmortal are in free-threaded-only code, initialization of core objects, tests, and guards that fall back to code that works with mortal objects. (For this 3.12 backport commit, I re-checked all calls to _Py_IsImmortal; the changed calls are different from the commits to 3.13 & 3.14.)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
Assignees
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Switch more _Py_IsImmortal(...) assertions to _Py_IsImmortalLoose(...), to account for stable-ABI extensions changing the refcount of immortal objects (similar to the _Py_IMMORTAL_BIT/_Py_IMMORTAL_REFCNT design that was approved in PEP-683 but never implemented).
The remaining calls to _Py_IsImmortal are in free-threaded-only code, initialization of core objects, tests, and guards that fall back to code that works with mortal objects.