Skip to content

gh-94185: Fix PyObject_NEW and PyObject_NEW_VAR #94186

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
wants to merge 5 commits into from
Closed

gh-94185: Fix PyObject_NEW and PyObject_NEW_VAR #94186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1f5622
Fix PyObject_NEW and PyObject_NEW_VAR by removing their first bracket…
trcrsired Jun 23, 2022
2f96e2e
Forget to commit the fix for PyObject_New_VAR
trcrsired Jun 23, 2022
7dc8d6d
Add NEWs for Fix PyObject_NEW and PyObject_NEW_VAR
trcrsired Jun 23, 2022
ff6d652
Merge branch 'main' into main
trcrsired Jun 23, 2022
85c8de6
Merge branch 'main' into main
trcrsired Jun 24, 2022
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
4 changes: 2 additions & 2 deletions Include/objimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,14 @@ PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t);

// Alias to PyObject_New(). In Python 3.8, PyObject_NEW() called directly
// PyObject_MALLOC() with _PyObject_SIZE().
#define PyObject_NEW(type, typeobj) PyObject_New((type), (typeobj))
#define PyObject_NEW(type, typeobj) PyObject_New(type, (typeobj))

#define PyObject_NewVar(type, typeobj, n) \
( (type *) _PyObject_NewVar((typeobj), (n)) )

// Alias to PyObject_NewVar(). In Python 3.8, PyObject_NEW_VAR() called
// directly PyObject_MALLOC() with _PyObject_VAR_SIZE().
#define PyObject_NEW_VAR(type, typeobj, n) PyObject_NewVar((type), (typeobj), (n))
#define PyObject_NEW_VAR(type, typeobj, n) PyObject_NewVar(type, (typeobj), (n))


/*
Expand Down
7 changes: 7 additions & 0 deletions Misc/NEWS.d/next/C API/2022-06-23-15-00-49.gh-issue-94185.dQkHfg.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Fix PyObject_NEW and PyObject_NEW_VAR

The commit 7ad6f74 tried to add brackets to tons of macros, but they break
PyObject_New and PyObject_MEW_VAR since the macro would expand to ((Type)*)
which breaks compilation for those CPython headers.

Fix the issue 94185.