pythongh-124064: Fix some -Wconversion warnings

vstinner · Sep 17, 2024 · 6899ab1 · 6899ab1
1 parent 28aea5d
commit 6899ab1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
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/Parser/pegen.c b/Parser/pegen.c
@@ -26,7 +26,7 @@ _PyPegen_byte_offset_to_character_offset_line(PyObject *line, Py_ssize_t col_off
 
     Py_ssize_t len = 0;
     while (col_offset < end_col_offset) {
-        Py_UCS4 ch = data[col_offset];
+        Py_UCS4 ch = (unsigned char)data[col_offset];
         if (ch < 0x80) {
             col_offset += 1;
         } else if ((ch & 0xe0) == 0xc0) {