Merge branch 'sverker/bad-hash'

1 files changed, 16 insertions, 10 deletions

diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index 58b5be3906..3336fded7a 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -697,7 +697,7 @@ static struct nbif nbifs[BIF_SIZE] = {
 #undef BIF_LIST
 };
 
-#define NBIF_HASH(m,f,a)	((m)*(f)+(a))
+#define NBIF_HASH(m,f,a)	(atom_val(m) ^ atom_val(f) ^ (a))
 static Hash nbif_table;
 
 static HashValue nbif_hash(struct nbif *x)
@@ -1063,7 +1063,7 @@ static inline void hipe_mfa_info_table_rwunlock(void)
     erts_smp_rwmtx_rwunlock(&hipe_mfa_info_table.lock);
 }
 
-#define HIPE_MFA_HASH(M,F,A)	((M) * (F) + (A))
+#define HIPE_MFA_HASH(M,F,A)	(atom_val(M) ^ atom_val(F) ^ (A))
 
 static struct hipe_mfa_info **hipe_mfa_info_table_alloc_bucket(unsigned int size)
 {
@@ -1144,10 +1144,13 @@ static inline struct hipe_mfa_info *hipe_mfa_info_table_get_locked(Eterm m, Eter
     h = HIPE_MFA_HASH(m, f, arity);
     i = h & hipe_mfa_info_table.mask;
     p = hipe_mfa_info_table.bucket[i];
-    for (; p; p = p->bucket.next)
-	/* XXX: do we want to compare p->bucket.hvalue as well? */
-	if (p->m == m && p->f == f && p->a == arity)
-	    return p;
+    for (; p; p = p->bucket.next) {
+        if (p->bucket.hvalue == h) {
+            if (p->m == m && p->f == f && p->a == arity)
+                return p;
+        }
+        else ASSERT(!(p->m == m && p->f == f && p->a == arity));
+    }
     return NULL;
 }
 
@@ -1171,10 +1174,13 @@ static struct hipe_mfa_info *hipe_mfa_info_table_put_rwlocked(Eterm m, Eterm f,
     h = HIPE_MFA_HASH(m, f, arity);
     i = h & hipe_mfa_info_table.mask;
     p = hipe_mfa_info_table.bucket[i];
-    for (; p; p = p->bucket.next)
-	/* XXX: do we want to compare p->bucket.hvalue as well? */
-	if (p->m == m && p->f == f && p->a == arity)
-	    return p;
+    for (; p; p = p->bucket.next) {
+        if (p->bucket.hvalue == h) {
+            if (p->m == m && p->f == f && p->a == arity)
+                return p;
+        }
+        else ASSERT(!(p->m == m && p->f == f && p->a == arity));
+    }
     p = hipe_mfa_info_table_alloc(m, f, arity);
     p->bucket.hvalue = h;
     p->bucket.next = hipe_mfa_info_table.bucket[i];