Index: src/pkg/runtime/hashmap_fast.go |
=================================================================== |
--- a/src/pkg/runtime/hashmap_fast.go |
+++ b/src/pkg/runtime/hashmap_fast.go |
@@ -23,7 +23,7 @@ |
// One-bucket table. No need to hash. |
b = (*bmap)(h.buckets) |
} else { |
- hash := gohash(t.key.alg, unsafe.Pointer(&key), 4, uintptr(h.hash0)) |
+ hash := goalg(t.key.alg).hash(noescape(unsafe.Pointer(&key)), 4, uintptr(h.hash0)) |
m := uintptr(1)<<h.B - 1 |
b = (*bmap)(add(h.buckets, (hash&m)*uintptr(h.bucketsize))) |
if c := h.oldbuckets; c != nil { |
@@ -67,7 +67,7 @@ |
// One-bucket table. No need to hash. |
b = (*bmap)(h.buckets) |
} else { |
- hash := gohash(t.key.alg, unsafe.Pointer(&key), 4, uintptr(h.hash0)) |
+ hash := goalg(t.key.alg).hash(noescape(unsafe.Pointer(&key)), 4, uintptr(h.hash0)) |
m := uintptr(1)<<h.B - 1 |
b = (*bmap)(add(h.buckets, (hash&m)*uintptr(h.bucketsize))) |
if c := h.oldbuckets; c != nil { |
@@ -111,7 +111,7 @@ |
// One-bucket table. No need to hash. |
b = (*bmap)(h.buckets) |
} else { |
- hash := gohash(t.key.alg, unsafe.Pointer(&key), 8, uintptr(h.hash0)) |
+ hash := goalg(t.key.alg).hash(noescape(unsafe.Pointer(&key)), 8, uintptr(h.hash0)) |
m := uintptr(1)<<h.B - 1 |
b = (*bmap)(add(h.buckets, (hash&m)*uintptr(h.bucketsize))) |
if c := h.oldbuckets; c != nil { |
@@ -155,7 +155,7 @@ |
// One-bucket table. No need to hash. |
b = (*bmap)(h.buckets) |
} else { |
- hash := gohash(t.key.alg, unsafe.Pointer(&key), 8, uintptr(h.hash0)) |
+ hash := goalg(t.key.alg).hash(noescape(unsafe.Pointer(&key)), 8, uintptr(h.hash0)) |
m := uintptr(1)<<h.B - 1 |
b = (*bmap)(add(h.buckets, (hash&m)*uintptr(h.bucketsize))) |
if c := h.oldbuckets; c != nil { |
@@ -254,7 +254,7 @@ |
return unsafe.Pointer(t.elem.zero) |
} |
dohash: |
- hash := gohash(t.key.alg, unsafe.Pointer(&ky), 2*ptrSize, uintptr(h.hash0)) |
+ hash := goalg(t.key.alg).hash(noescape(unsafe.Pointer(&ky)), 2*ptrSize, uintptr(h.hash0)) |
m := uintptr(1)<<h.B - 1 |
b := (*bmap)(add(h.buckets, (hash&m)*uintptr(h.bucketsize))) |
if c := h.oldbuckets; c != nil { |
@@ -356,7 +356,7 @@ |
return unsafe.Pointer(t.elem.zero), false |
} |
dohash: |
- hash := gohash(t.key.alg, unsafe.Pointer(&ky), 2*ptrSize, uintptr(h.hash0)) |
+ hash := goalg(t.key.alg).hash(noescape(unsafe.Pointer(&ky)), 2*ptrSize, uintptr(h.hash0)) |
m := uintptr(1)<<h.B - 1 |
b := (*bmap)(add(h.buckets, (hash&m)*uintptr(h.bucketsize))) |
if c := h.oldbuckets; c != nil { |