Skip to content

gh-142038: Expand guard for types_world_is_stopped to fix debug builds without assertions #142039

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
vstinner merged 2 commits into from
Dec 3, 2025
Merged

gh-142038: Expand guard for types_world_is_stopped to fix debug builds without assertions #142039

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dadaadc
gh-142038: Expand guard for types_world_is_stopped to fix debug build…
xhochy Nov 28, 2025
a0f7998
Py_Debug -> Py_DEBUG
xhochy Nov 28, 2025
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
2 changes: 1 addition & 1 deletion Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class object "PyObject *" "&PyBaseObject_Type"

#define END_TYPE_DICT_LOCK() Py_END_CRITICAL_SECTION2()

#ifndef NDEBUG
#if !defined(NDEBUG) || defined(Py_Debug)
Copy link
Member

@picnixz picnixz Nov 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

The name of the macro is not Py_Debug but Py_DEBUG And ideally, I think we should instead use Py_DEBUG rather than NDEBUG.

Copy link
Contributor

@kumaraditya303 kumaraditya303 Nov 28, 2025

Choose a reason for hiding this comment

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

Agreed, this should be just Py_DEBUG.

Copy link
Contributor Author

@xhochy xhochy Nov 28, 2025

Choose a reason for hiding this comment

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

We had that before, and that caused problems for non-debug builds with --with-assertions. This issue was then addressed by #140133, which, however, introduced a new problem with debug-without-assertions builds.

// Return true if the world is currently stopped.
static bool
types_world_is_stopped(void)
Expand Down
Loading