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

gh-124064: Fix some -Wconversion warnings #124174

Merged
merged 4 commits into from
Sep 17, 2024
Merged

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Sep 17, 2024

@vstinner vstinner enabled auto-merge (squash) September 17, 2024 14:25
@@ -227,7 +227,7 @@ static inline void _PyGC_CLEAR_FINALIZED(PyObject *op) {
_PyObject_CLEAR_GC_BITS(op, _PyGC_BITS_FINALIZED);
#else
PyGC_Head *gc = _Py_AS_GC(op);
gc->_gc_prev &= ~_PyGC_PREV_MASK_FINALIZED;
gc->_gc_prev &= ~(uintptr_t)_PyGC_PREV_MASK_FINALIZED;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it might be better to make the _PyGC_PREV_MASK_FINALIZED literal unsigned.

Copy link
Member Author

Choose a reason for hiding this comment

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

I tried #define _PyGC_PREV_MASK_FINALIZED 1U but the code got miscompiled and failed.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ugh... you're right. It won't get sign extended in that case.

Copy link
Member Author

Choose a reason for hiding this comment

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

I wrote a different fix in the following change: #124177

-#define _PyGC_PREV_MASK_FINALIZED 1
+#define _PyGC_PREV_MASK_FINALIZED ((uintptr_t)1)

It seems to work like that. I also prefer to fix the constant declaration rather than having to cast the constant every time.

Copy link
Contributor

Choose a reason for hiding this comment

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

FYI, I started a discussion about -Wsign-conversion in the #gsoc-security-project Discord channel. It seems to me that adding these explicit casts in many places to address -Wsign-conversion does not make the code less bug prone and probably does the opposite.

In this case, we now have a tighter coupling between the _PyGC_PREV_MASK_FINALIZED and the type of _gc_prev and _gc_next. That seems worse to me than before where we relied on the implicit sign conversion.

For example, if we hypothetically changed _gc_prev to uint64_t, the code would now be incorrect.

@@ -98,7 +98,7 @@ typedef union _PyStackRef {
static inline PyObject *
PyStackRef_AsPyObjectBorrow(_PyStackRef stackref)
{
PyObject *cleared = ((PyObject *)((stackref).bits & (~Py_TAG_BITS)));
PyObject *cleared = ((PyObject *)((stackref).bits & (~(uintptr_t)Py_TAG_BITS)));
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

@vstinner vstinner merged commit 98f93a3 into python:main Sep 17, 2024
35 checks passed
@vstinner vstinner deleted the conversion branch September 17, 2024 14:43
savannahostrowski pushed a commit to savannahostrowski/cpython that referenced this pull request Sep 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants