[llvm] [ADT] Update hash function of uint64_t for DenseMap (PR #95734)

[Chuanqi Xu via llvm-commits]

https://github.com/ChuanqiXu9 updated https://github.com/llvm/llvm-project/pull/95734

>From c7b23d8d31776b123b2b786bf7f1cf60b7234c38 Mon Sep 17 00:00:00 2001
From: Chuanqi Xu <yedeng.yd at linux.alibaba.com>
Date: Mon, 17 Jun 2024 11:37:25 +0800
Subject: [PATCH 1/3] [ADT] Update hash function of uint64_t for DenseMap

---
 llvm/include/llvm/ADT/DenseMapInfo.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/include/llvm/ADT/DenseMapInfo.h b/llvm/include/llvm/ADT/DenseMapInfo.h
index 5b7dce7b53c62..61869d8e7fbb0 100644
--- a/llvm/include/llvm/ADT/DenseMapInfo.h
+++ b/llvm/include/llvm/ADT/DenseMapInfo.h
@@ -151,7 +151,7 @@ template<> struct DenseMapInfo<unsigned long long> {
   static inline unsigned long long getTombstoneKey() { return ~0ULL - 1ULL; }
 
   static unsigned getHashValue(const unsigned long long& Val) {
-    return (unsigned)(Val * 37ULL);
+    return DenseMapInfo<unsigned>(Val) ^ DenseMapInfo<unsigned>(Val >> 32);
   }
 
   static bool isEqual(const unsigned long long& LHS,

>From 773ade75191b0a8e988ce38e57de3416f1610ae4 Mon Sep 17 00:00:00 2001
From: Chuanqi Xu <yedeng.yd at linux.alibaba.com>
Date: Mon, 17 Jun 2024 13:17:49 +0800
Subject: [PATCH 2/3] Update

---
 llvm/include/llvm/ADT/DenseMapInfo.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/llvm/include/llvm/ADT/DenseMapInfo.h b/llvm/include/llvm/ADT/DenseMapInfo.h
index 61869d8e7fbb0..0def1dccdf4c3 100644
--- a/llvm/include/llvm/ADT/DenseMapInfo.h
+++ b/llvm/include/llvm/ADT/DenseMapInfo.h
@@ -151,7 +151,8 @@ template<> struct DenseMapInfo<unsigned long long> {
   static inline unsigned long long getTombstoneKey() { return ~0ULL - 1ULL; }
 
   static unsigned getHashValue(const unsigned long long& Val) {
-    return DenseMapInfo<unsigned>(Val) ^ DenseMapInfo<unsigned>(Val >> 32);
+    return DenseMapInfo<unsigned>::getHashValue(Val) ^
+           DenseMapInfo<unsigned>::getHashValue(Val >> 32);
   }
 
   static bool isEqual(const unsigned long long& LHS,

>From 0456725d21b48191f4e828e33859b7c72d9d7f36 Mon Sep 17 00:00:00 2001
From: Chuanqi Xu <yedeng.yd at linux.alibaba.com>
Date: Tue, 18 Jun 2024 10:07:57 +0800
Subject: [PATCH 3/3] Update

---
 llvm/include/llvm/ADT/DenseMapInfo.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/llvm/include/llvm/ADT/DenseMapInfo.h b/llvm/include/llvm/ADT/DenseMapInfo.h
index 0def1dccdf4c3..b039afee66c10 100644
--- a/llvm/include/llvm/ADT/DenseMapInfo.h
+++ b/llvm/include/llvm/ADT/DenseMapInfo.h
@@ -137,7 +137,12 @@ template<> struct DenseMapInfo<unsigned long> {
   static inline unsigned long getTombstoneKey() { return ~0UL - 1L; }
 
   static unsigned getHashValue(const unsigned long& Val) {
-    return (unsigned)(Val * 37UL);
+    if constexpr (sizeof(Val) == 4)
+      return DenseMapInfo<unsigned>::getHashValue(Val);
+    else
+      return detail::combineHashValue(
+          DenseMapInfo<unsigned>::getHashValue(Val),
+          DenseMapInfo<unsigned>::getHashValue(Val >> 32));
   }
 
   static bool isEqual(const unsigned long& LHS, const unsigned long& RHS) {
@@ -151,8 +156,9 @@ template<> struct DenseMapInfo<unsigned long long> {
   static inline unsigned long long getTombstoneKey() { return ~0ULL - 1ULL; }
 
   static unsigned getHashValue(const unsigned long long& Val) {
-    return DenseMapInfo<unsigned>::getHashValue(Val) ^
-           DenseMapInfo<unsigned>::getHashValue(Val >> 32);
+    return detail::combineHashValue(
+        DenseMapInfo<unsigned>::getHashValue(Val),
+        DenseMapInfo<unsigned>::getHashValue(Val >> 32));
   }
 
   static bool isEqual(const unsigned long long& LHS,