Skip to content
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.

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

bpo-40170: Convert PyObject_IS_GC() macro to a function #19464

Merged
merged 14 commits into from
Apr 14, 2020

Conversation

shihai1991
Copy link
Member

@shihai1991 shihai1991 commented Apr 10, 2020

@pablogsal
Copy link
Member

@shihai1991 Could you rebase the PR to pick the latest changes?

@shihai1991
Copy link
Member Author

@shihai1991 Could you rebase the PR to pick the latest changes?

Got it, done ;)

Copy link
Member

@pablogsal pablogsal left a comment

Choose a reason for hiding this comment

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

Hummmm, I think we still need a macro version for internal use for performance reasons. @vstinner was that your original intent?

@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@vstinner
Copy link
Member

Hummmm, I think we still need a macro version for internal use for performance reasons.

Right, please add a static inline function _PyObject_IS_GC() in pycore_object.h and modify gcmodule.c to use it (replace PyObject_IS_GC with _PyObject_IS_GC).

PyObject_IS_GC() function body should just call _PyObject_IS_GC().

@shihai1991
Copy link
Member Author

I have made the requested changes; please review again

@bedevere-bot
Copy link

Thanks for making the requested changes!

@pablogsal: please review the changes made to this pull request.

Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Doc/c-api/gcsupport.rst Show resolved Hide resolved
Modules/gcmodule.c Outdated Show resolved Hide resolved
Comment on lines 130 to 133
if (PyType_IS_GC(Py_TYPE(obj))) {
return (Py_TYPE(obj)->tp_is_gc == NULL || Py_TYPE(obj)->tp_is_gc(obj));
}
return 0;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if (PyType_IS_GC(Py_TYPE(obj))) {
return (Py_TYPE(obj)->tp_is_gc == NULL || Py_TYPE(obj)->tp_is_gc(obj));
}
return 0;
return (PyType_IS_GC(Py_TYPE(obj))
&& (Py_TYPE(obj)->tp_is_gc == NULL
|| Py_TYPE(obj)->tp_is_gc(obj)));

Copy link
Member Author

Choose a reason for hiding this comment

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

this code style looks more simple?

Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
shihai1991 and others added 4 commits April 14, 2020 22:53
Co-Authored-By: Victor Stinner <vstinner@python.org>
Co-Authored-By: Victor Stinner <vstinner@python.org>
Include/cpython/objimpl.h Outdated Show resolved Hide resolved
Include/cpython/objimpl.h Outdated Show resolved Hide resolved
@vstinner vstinner merged commit 675d9a3 into python:master Apr 14, 2020
@vstinner
Copy link
Member

Thanks @shihai1991!

@shihai1991
Copy link
Member Author

Thanks @shihai1991!

Thanks, folks. I learned much in this PR(especially in docs(what is user really need).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants