fix windows 32 bit: use clang -target i686-pc-windows-msvc

Author: clintonsteiner

Include/internal/pycore_dict.h

@@ -232,13 +232,21 @@ struct _dictvalues {
 #define DK_SIZE(dk)      (1<<DK_LOG_SIZE(dk))
 #endif
 
-static inline void* _DK_INDICES_BASE(const PyDictKeysObject *dk) {
+static inline const void* _DK_INDICES_CONST_BASE(const PyDictKeysObject *dk) {
     size_t indices_size = (size_t)1 << dk->dk_log2_index_bytes;
-    return (char *)dk - indices_size;
+    return (const char *)dk - indices_size;
+}
+
+static inline void* _DK_INDICES_BASE(PyDictKeysObject *dk) {
+    return (void *)_DK_INDICES_CONST_BASE(dk);
+}
+
+static inline const void* _DK_ALLOC_CONST_BASE(const PyDictKeysObject *dk) {
+    return _DK_INDICES_CONST_BASE(dk);
 }
 
 static inline void* _DK_ALLOC_BASE(PyDictKeysObject *dk) {
-    return _DK_INDICES_BASE(dk);
+    return (void *)_DK_ALLOC_CONST_BASE(dk);
 }
 
 static inline void* _DK_ENTRIES(PyDictKeysObject *dk) {

Modules/_testinternalcapi.c

@@ -1904,7 +1904,7 @@ dict_getitem_knownhash(PyObject *self, PyObject *args)
 }
 
 static size_t
-dict_index_bytes_for_keys(PyDictKeysObject *keys)
+dict_index_bytes_for_keys(const PyDictKeysObject *keys)
 {
     int index_shift = keys->dk_log2_index_bytes - DK_LOG_SIZE(keys);
     if (index_shift == 0) {
@@ -1936,7 +1936,7 @@ dict_check_indices_layout(PyObject *self, PyObject *arg)
     PyDictKeysObject *keys = mp->ma_keys;
 
     size_t indices_size = (size_t)1 << keys->dk_log2_index_bytes;
-    char *base = (char *)_DK_ALLOC_BASE(keys);
+    const char *base = (const char *)_DK_ALLOC_CONST_BASE(keys);
     char *header = (char *)keys;
     char *entries = (char *)_DK_ENTRIES(keys);
 
@@ -1945,7 +1945,7 @@ dict_check_indices_layout(PyObject *self, PyObject *arg)
     ok &= (entries == header + offsetof(PyDictKeysObject, dk_entries));
 
     size_t index_bytes = dict_index_bytes_for_keys(keys);
-    char *idx_base = (char *)_DK_INDICES_BASE(keys);
+    const char *idx_base = (const char *)_DK_INDICES_CONST_BASE(keys);
     /* Index 0 is stored immediately before the header. */
     char *idx0 = (char *)keys - (ptrdiff_t)index_bytes;
     ok &= (idx0 == idx_base + indices_size - (ptrdiff_t)index_bytes);

Objects/dictobject.c

@@ -182,7 +182,7 @@ ASSERT_DICT_LOCKED(PyObject *op)
 
 #define IS_DICT_SHARED(mp) _PyObject_GC_IS_SHARED(mp)
 #define SET_DICT_SHARED(mp) _PyObject_GC_SET_SHARED(mp)
-#define LOAD_INDEX(keys, size, idx) _Py_atomic_load_int##size##_relaxed(&((const int##size##_t*)(_DK_INDICES_BASE(keys)))[(idx)]);
+#define LOAD_INDEX(keys, size, idx) _Py_atomic_load_int##size##_relaxed(&((const int##size##_t*)(_DK_INDICES_CONST_BASE(keys)))[(idx)]);
 #define STORE_INDEX(keys, size, idx, value) _Py_atomic_store_int##size##_relaxed(&((int##size##_t*)(_DK_INDICES_BASE(keys)))[(idx)], (int##size##_t)value);
 #define ASSERT_OWNED_OR_SHARED(mp) \
     assert(_Py_IsOwnedByCurrentThread((PyObject *)mp) || IS_DICT_SHARED(mp));
@@ -262,7 +262,7 @@ static inline void split_keys_entry_added(PyDictKeysObject *keys)
 #define UNLOCK_KEYS_IF_SPLIT(keys, kind)
 #define IS_DICT_SHARED(mp) (false)
 #define SET_DICT_SHARED(mp)
-#define LOAD_INDEX(keys, size, idx) ((const int##size##_t*)(_DK_INDICES_BASE(keys)))[(idx)]
+#define LOAD_INDEX(keys, size, idx) ((const int##size##_t*)(_DK_INDICES_CONST_BASE(keys)))[(idx)]
 #define STORE_INDEX(keys, size, idx, value) ((int##size##_t*)(_DK_INDICES_BASE(keys)))[(idx)] = (int##size##_t)value
 
 static inline void split_keys_entry_added(PyDictKeysObject *keys)
@@ -651,7 +651,7 @@ static const _PyDict_EmptyKeysStorage empty_keys_storage = {
         1, /* dk_version */
         0, /* dk_usable (immutable) */
         0, /* dk_nentries */
-        {}, /* dk_entries */
+        {0}, /* dk_entries */
     }
 };
 
@@ -989,7 +989,7 @@ clone_combined_dict_keys(PyDictObject *orig)
 
     PyDictKeysObject *keys = (PyDictKeysObject *)((char *)base + indices_size);
 
-    memcpy(base, _DK_ALLOC_BASE(orig_keys), keys_size);
+    memcpy(base, _DK_ALLOC_CONST_BASE(orig_keys), keys_size);
 
     /* After copying key/value pairs, we need to incref all
        keys and values and they are about to be co-owned by a