From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 10 Sep 2016 18:34:43 +0000 (+0300)
Subject: Fixed compiler warnings in compact dict implementation on 32-bit platforms.
X-Git-Tag: v3.6.0b1~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=473e0e4dbae1e84d0c7a6732e839200532e168cc;p=thirdparty%2FPython%2Fcpython.git

Fixed compiler warnings in compact dict implementation on 32-bit platforms.
---

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 91a4e7d55981..4bcc3db91127 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -326,16 +326,16 @@ dk_get_index(PyDictKeysObject *keys, Py_ssize_t i)
         int16_t *indices = keys->dk_indices.as_2;
         ix = indices[i];
     }
-    else if (s <= 0xffffffff) {
-        int32_t *indices = keys->dk_indices.as_4;
-        ix = indices[i];
-    }
 #if SIZEOF_VOID_P > 4
-    else {
+    else if (s > 0xffffffff) {
         int64_t *indices = keys->dk_indices.as_8;
         ix = indices[i];
     }
 #endif
+    else {
+        int32_t *indices = keys->dk_indices.as_4;
+        ix = indices[i];
+    }
     assert(ix >= DKIX_DUMMY);
     return ix;
 }
@@ -358,17 +358,17 @@ dk_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix)
         assert(ix <= 0x7fff);
         indices[i] = (int16_t)ix;
     }
-    else if (s <= 0xffffffff) {
-        int32_t *indices = keys->dk_indices.as_4;
-        assert(ix <= 0x7fffffff);
-        indices[i] = (int32_t)ix;
-    }
 #if SIZEOF_VOID_P > 4
-    else {
+    else if (s > 0xffffffff) {
         int64_t *indices = keys->dk_indices.as_8;
         indices[i] = ix;
     }
 #endif
+    else {
+        int32_t *indices = keys->dk_indices.as_4;
+        assert(ix <= 0x7fffffff);
+        indices[i] = (int32_t)ix;
+    }
 }