Skip to content

gh-127119: Remove check on accidental deallocation of immortal objects for free-threaded build #127120

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

Closed
eendebakpt wants to merge 17 commits into from
Closed

gh-127119: Remove check on accidental deallocation of immortal objects for free-threaded build #127120

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
19d64f0
Remove check on small ints in long_dealloc
eendebakpt Nov 21, 2024
4117c54
rewrite assert
eendebakpt Nov 22, 2024
38862e3
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 22, 2024
a82a6ab
Merge branch 'main' into small_int_immortal
eendebakpt Nov 22, 2024
d8c318d
avoid warnings in release builds by using Py_DEBUG
eendebakpt Nov 22, 2024
0cd1eba
Update Misc/NEWS.d/next/Core_and_Builtins/2024-11-22-07-58-00.gh-issu…
eendebakpt Nov 22, 2024
4dc97c9
Merge branch 'main' into small_int_immortal
eendebakpt Nov 22, 2024
2c23541
use NDEBUG
eendebakpt Nov 22, 2024
7d3a012
Merge branch 'main' into small_int_immortal
eendebakpt Nov 22, 2024
00b735f
Merge branch 'small_int_immortal' of github.com:eendebakpt/cpython in…
eendebakpt Nov 22, 2024
ea17aee
whitespace
eendebakpt Nov 22, 2024
312c790
Merge branch 'main' into small_int_immortal
eendebakpt Nov 22, 2024
fe0076c
Merge branch 'main' into small_int_immortal
eendebakpt Nov 22, 2024
0837699
keep check in stable ABI build
eendebakpt Nov 24, 2024
0764241
typo
eendebakpt Nov 24, 2024
56f4133
review comments
eendebakpt Nov 25, 2024
8f6bf27
apply same rule to all cases
eendebakpt Dec 7, 2024
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
Prev Previous commit
Next Next commit
keep check in stable ABI build
  • Loading branch information
@eendebakpt
eendebakpt committed Nov 24, 2024
commit 08376995b468ecaa8c85965cef0af11c9f82828b
25 changes: 13 additions & 12 deletions Objects/longobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3611,28 +3611,29 @@ long_richcompare(PyObject *self, PyObject *other, int op)
Py_RETURN_RICHCOMPARE(result, 0, op);
}

#ifndef NDEBUG
static int _is_python_smallint(PyObject *op)
long_dealloc(PyObject *self)
{
PyLongObject *pylong = (PyLongObject*)op;
#ifdef Py_LIMITED_API
#ifndef Py_GIL_DISABLED
Copy link
Copy Markdown
Member

@ZeroIntensity ZeroIntensity Nov 25, 2024

Choose a reason for hiding this comment

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

I'm not sure it's possible for us to know when we're using the limited API. Py_LIMITED_API is something that affects Python.h at the compile-time of an extension module, but this happens during the compilation of CPython, so it will never be true.

/* This should never get called, but we also don't want to SEGV if
* we accidentally decref small Ints out of existence. Instead,
* since small Ints are immortal, re-set the reference count.
*
* See PEP 683, section Accidental De-Immortalizing for details
*/
PyLongObject *pylong = (PyLongObject*)self;
if (pylong && _PyLong_IsCompact(pylong)) {
stwodigits ival = medium_value(pylong);
if (IS_SMALL_INT(ival)) {
PyLongObject *small_pylong = (PyLongObject *)get_small_int((sdigit)ival);
if (pylong == small_pylong) {
return 1;
_Py_SetImmortal(self);
return;
}
}
}
return 0;
}
#endif

static void
long_dealloc(PyObject *self)
{
// assert the small ints are not deallocated
assert(!_is_python_smallint(self));
#endif
Py_TYPE(self)->tp_free(self);
}

Expand Down