gh-124064: Fix -Wconversion warnings in pycore_{gc,list,stackref}.h (#124174)

vstinner · web-flow · commit 98f93a32f395 · 2024-09-17T14:43:39.000Z
diff --git a/Include/internal/pycore_gc.h b/Include/internal/pycore_gc.h
@@ -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;
 #endif
 }
 
diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h
@@ -45,7 +45,7 @@ _Py_memory_repeat(char* dest, Py_ssize_t len_dest, Py_ssize_t len_src)
     Py_ssize_t copied = len_src;
     while (copied < len_dest) {
         Py_ssize_t bytes_to_copy = Py_MIN(copied, len_dest - copied);
-        memcpy(dest + copied, dest, bytes_to_copy);
+        memcpy(dest + copied, dest, (size_t)bytes_to_copy);
         copied += bytes_to_copy;
     }
 }
diff --git a/Include/internal/pycore_stackref.h b/Include/internal/pycore_stackref.h
@@ -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)));
     return cleared;
 }
 #else
@@ -133,7 +133,7 @@ _PyStackRef_FromPyObjectSteal(PyObject *obj)
 {
     // Make sure we don't take an already tagged value.
     assert(((uintptr_t)obj & Py_TAG_BITS) == 0);
-    int tag = (obj == NULL || _Py_IsImmortal(obj)) ? (Py_TAG_DEFERRED) : Py_TAG_PTR;
+    unsigned int tag = (obj == NULL || _Py_IsImmortal(obj)) ? (Py_TAG_DEFERRED) : Py_TAG_PTR;
     return ((_PyStackRef){.bits = ((uintptr_t)(obj)) | tag});
 }
 #   define PyStackRef_FromPyObjectSteal(obj) _PyStackRef_FromPyObjectSteal(_PyObject_CAST(obj))
diff --git a/Tools/build/.warningignore_macos b/Tools/build/.warningignore_macos
@@ -6,7 +6,6 @@
 Include/internal/mimalloc/mimalloc/internal.h 4
 Include/internal/pycore_backoff.h 1
 Include/internal/pycore_dict.h 2
-Include/internal/pycore_gc.h 1
 Include/internal/pycore_long.h 2
 Include/internal/pycore_object.h 4
 Modules/_asynciomodule.c 3
diff --git a/Tools/build/.warningignore_ubuntu b/Tools/build/.warningignore_ubuntu
@@ -19,10 +19,7 @@ Include/internal/pycore_asdl.h 1
 Include/internal/pycore_backoff.h 3
 Include/internal/pycore_blocks_output_buffer.h 1
 Include/internal/pycore_dict.h 2
-Include/internal/pycore_gc.h 1
-Include/internal/pycore_gc.h 1
 Include/internal/pycore_interp.h 1
-Include/internal/pycore_list.h 1
 Include/internal/pycore_long.h 3
 Include/internal/pycore_object.h 4
 Include/internal/pycore_obmalloc.h 1
@@ -233,7 +230,6 @@ Python/generated_cases.c.h 27
 Python/generated_cases.c.h 27
 Python/getargs.c 7
 Python/hashtable.c 1
-Python/import.c 6
 Python/import.c 7
 Python/initconfig.c 11
 Python/instrumentation.c 43

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ static inline void _PyGC_CLEAR_FINALIZED(PyObject *op) {`
`227`	`227`	`_PyObject_CLEAR_GC_BITS(op, _PyGC_BITS_FINALIZED);`
`228`	`228`	`#else`
`229`	`229`	`PyGC_Head *gc = _Py_AS_GC(op);`
`230`		`- gc->_gc_prev &= ~_PyGC_PREV_MASK_FINALIZED;`
	`230`	`+ gc->_gc_prev &= ~(uintptr_t)_PyGC_PREV_MASK_FINALIZED;`
`231`	`231`	`#endif`
`232`	`232`	`}`
`233`	`233`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ _Py_memory_repeat(char* dest, Py_ssize_t len_dest, Py_ssize_t len_src)`
`45`	`45`	`Py_ssize_t copied = len_src;`
`46`	`46`	`while (copied < len_dest) {`
`47`	`47`	`Py_ssize_t bytes_to_copy = Py_MIN(copied, len_dest - copied);`
`48`		`- memcpy(dest + copied, dest, bytes_to_copy);`
	`48`	`+ memcpy(dest + copied, dest, (size_t)bytes_to_copy);`
`49`	`49`	`copied += bytes_to_copy;`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ typedef union _PyStackRef {`
`98`	`98`	`static inline PyObject *`
`99`	`99`	`PyStackRef_AsPyObjectBorrow(_PyStackRef stackref)`
`100`	`100`	`{`
`101`		`- PyObject cleared = ((PyObject )((stackref).bits & (~Py_TAG_BITS)));`
	`101`	`+ PyObject cleared = ((PyObject )((stackref).bits & (~(uintptr_t)Py_TAG_BITS)));`
`102`	`102`	`return cleared;`
`103`	`103`	`}`
`104`	`104`	`#else`
`@@ -133,7 +133,7 @@ _PyStackRef_FromPyObjectSteal(PyObject *obj)`
`133`	`133`	`{`
`134`	`134`	`// Make sure we don't take an already tagged value.`
`135`	`135`	`assert(((uintptr_t)obj & Py_TAG_BITS) == 0);`
`136`		`- int tag = (obj == NULL \|\| _Py_IsImmortal(obj)) ? (Py_TAG_DEFERRED) : Py_TAG_PTR;`
	`136`	`+ unsigned int tag = (obj == NULL \|\| _Py_IsImmortal(obj)) ? (Py_TAG_DEFERRED) : Py_TAG_PTR;`
`137`	`137`	`return ((_PyStackRef){.bits = ((uintptr_t)(obj)) \| tag});`
`138`	`138`	`}`
`139`	`139`	`# define PyStackRef_FromPyObjectSteal(obj) _PyStackRef_FromPyObjectSteal(_PyObject_CAST(obj))`