diff options
| author | Keith Randall <khr@golang.org> | 2014-12-12 13:45:19 -0800 |
|---|---|---|
| committer | Keith Randall <khr@golang.org> | 2014-12-15 21:43:49 +0000 |
| commit | df1739c77d4eb4f700722b4eb70b6036df96a9b9 (patch) | |
| tree | 4aacf736bac265bfb82a14010410ab7f426420fa /src/runtime/hashmap.go | |
| parent | 324f38a222cc48439a11a5545c85cb8614385987 (diff) | |
| download | go-df1739c77d4eb4f700722b4eb70b6036df96a9b9.tar.xz | |
runtime: if key type is reflexive, don't call equal(k, k)
Most types are reflexive (k == k for all k of type t), so don't
bother calling equal(k, k) when the key type is reflexive.
Change-Id: Ia716b4198b8b298687843b94b878dbc5e8fc2c65
Reviewed-on: https://go-review.googlesource.com/1480
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/runtime/hashmap.go')
| -rw-r--r-- | src/runtime/hashmap.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/hashmap.go b/src/runtime/hashmap.go index b4e624423f..0aa7c60af6 100644 --- a/src/runtime/hashmap.go +++ b/src/runtime/hashmap.go @@ -652,7 +652,7 @@ next: if t.indirectkey { k2 = *((*unsafe.Pointer)(k2)) } - if alg.equal(k2, k2, uintptr(t.key.size)) { + if t.reflexivekey || alg.equal(k2, k2, uintptr(t.key.size)) { // If the item in the oldbucket is not destined for // the current new bucket in the iteration, skip it. hash := alg.hash(k2, uintptr(t.key.size), uintptr(h.hash0)) @@ -689,7 +689,7 @@ next: if t.indirectkey { k2 = *((*unsafe.Pointer)(k2)) } - if alg.equal(k2, k2, uintptr(t.key.size)) { + if t.reflexivekey || alg.equal(k2, k2, uintptr(t.key.size)) { // Check the current hash table for the data. // This code handles the case where the key // has been deleted, updated, or deleted and reinserted. @@ -798,7 +798,7 @@ func evacuate(t *maptype, h *hmap, oldbucket uintptr) { // to send this key/value to bucket x or bucket y). hash := alg.hash(k2, uintptr(t.key.size), uintptr(h.hash0)) if h.flags&iterator != 0 { - if !alg.equal(k2, k2, uintptr(t.key.size)) { + if !t.reflexivekey && !alg.equal(k2, k2, uintptr(t.key.size)) { // If key != key (NaNs), then the hash could be (and probably // will be) entirely different from the old hash. Moreover, // it isn't reproducible. Reproducibility is required in the |