bpo-31849: Fix warning in pyhash.c (GH-6799)

miss-islington · ajdavis · web-flow · commit 4251d2a3540b · 2018-06-04T10:14:26.000-07:00
(cherry picked from commit a8eb585) Co-authored-by: A. Jesse Jiryu Davis <jesse@emptysquare.net>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-05-14-11-00-00.bpo-31849.EmHaH4.rst b/Misc/NEWS.d/next/Core and Builtins/2018-05-14-11-00-00.bpo-31849.EmHaH4.rst
@@ -0,0 +1 @@
+Fix signed/unsigned comparison warning in pyhash.c.
diff --git a/Python/pyhash.c b/Python/pyhash.c
@@ -272,8 +272,8 @@ fnv(const void *src, Py_ssize_t len)
         x = (_PyHASH_MULTIPLIER * x) ^ (Py_uhash_t) *p++;
     x ^= (Py_uhash_t) len;
     x ^= (Py_uhash_t) _Py_HashSecret.fnv.suffix;
-    if (x == -1) {
-        x = -2;
+    if (x == (Py_uhash_t) -1) {
+        x = (Py_uhash_t) -2;
     }
     return x;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix signed/unsigned comparison warning in pyhash.c.`
Original file line number	Diff line number	Diff line change
`@@ -272,8 +272,8 @@ fnv(const void *src, Py_ssize_t len)`
`272`	`272`	`x = (_PyHASH_MULTIPLIER * x) ^ (Py_uhash_t) *p++;`
`273`	`273`	`x ^= (Py_uhash_t) len;`
`274`	`274`	`x ^= (Py_uhash_t) _Py_HashSecret.fnv.suffix;`
`275`		`- if (x == -1) {`
`276`		`- x = -2;`
	`275`	`+ if (x == (Py_uhash_t) -1) {`
	`276`	`+ x = (Py_uhash_t) -2;`
`277`	`277`	`}`
`278`	`278`	`return x;`
`279`	`279`	`}`