Fix two warnings in this code that I missed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151839 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/Hashing.h b/include/llvm/ADT/Hashing.h
index ccf352cb52b520ca2d90d612b637620c3b10e4b8..e5969a3c05a377a2f3f2fdb36bb5a0be3571e719 100644 (file)
--- a/include/llvm/ADT/Hashing.h
+++ b/include/llvm/ADT/Hashing.h
@@ -219,7 +219,7 @@ inline uint64_t hash_33to64_bytes(const char *s, size_t len, uint64_t seed) {
   uint64_t wf = a + z;
   uint64_t ws = b + rotate(a, 31) + c;
   uint64_t r = shift_mix((vf + ws) * k2 + (wf + vs) * k0);
-  return shift_mix(seed ^ (r * k0) + vs) * k2;
+  return shift_mix((seed ^ (r * k0)) + vs) * k2;
 }
 
 inline uint64_t hash_short(const char *s, size_t length, uint64_t seed) {
@@ -325,8 +325,9 @@ inline size_t get_execution_seed() {
   //
   // However, if there is a fixed seed override set the first time this is
   // called, return that instead of the per-execution seed.
+  const uint64_t seed_prime = 0xff51afd7ed558ccdULL;
   static size_t seed = fixed_seed_override ? fixed_seed_override
-                                           : 0xff51afd7ed558ccdULL;
+                                           : static_cast<size_t>(seed_prime);
   return seed;
 }