From: Russ Cox <rsc@golang.org>
Date: Fri, 21 Sep 2012 19:53:47 +0000 (+1000)
Subject: [release-branch.go1] runtime: detect hash map collision problems
X-Git-Tag: go1.0.3~193
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3b81bac147743fe83c7058a2394098ffd5093155;p=gostls13.git

[release-branch.go1] runtime: detect hash map collision problems

««« backport f99b9475b914
runtime: detect hash map collision problems

This can only happen if the hash function we're using is getting
far more than it's fair share of collisions, but that has happened
to us repeatedly as we've expanded the allowed use cases for
hash tables (issue 1544, issue 2609, issue 2630, issue 2883, issue 3695).
Maybe this will help the next time we try something new.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6306083

»»»
---

diff --git a/src/pkg/runtime/hashmap.c b/src/pkg/runtime/hashmap.c
index ea9887a19f..e8965a68d5 100644
--- a/src/pkg/runtime/hashmap.c
+++ b/src/pkg/runtime/hashmap.c
@@ -416,8 +416,12 @@ hash_insert_internal (MapType *t, struct hash_subtable **pst, int32 flags, hash_
 					*pres = ins_e->data;
 					return (1);
 				}
-				assert (e_hash != hash || (flags & HASH_REHASH) == 0);
-				hash += (e_hash == hash);	   /* adjust hash if it collides */
+				if (e_hash == hash) {	   /* adjust hash if it collides */
+					assert ((flags & HASH_REHASH) == 0);
+					hash++;
+					if ((hash & HASH_MASK) == HASH_SUBHASH)
+						runtime·throw("runtime: map hash collision overflow");
+				}
 				ins_e = HASH_OFFSET (ins_e, elemsize);
 				ins_i++;
 				if (e_hash <= hash) {	       /* set e to insertion point */