Skip to content

Commit

Permalink
hash/maphash: simplify pointer size checks
Browse files Browse the repository at this point in the history
Use internal/goarch.PtrSize, instead of unsafe.Sizeof(uintptr(0)).

Change-Id: If501ae9853ed384c4b9485e2c3b0aeba03c17685
Reviewed-on: https://go-review.googlesource.com/c/go/+/630795
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Cherry Mui <cherryyz@google.com>
cherrymui authored and gopherbot committed Nov 21, 2024
1 parent efe0a86 commit a1d62aa
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/hash/maphash/maphash_runtime.go
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ package maphash

import (
"internal/abi"
"internal/goarch"
"internal/goexperiment"
"unsafe"
)
@@ -27,7 +28,7 @@ func rthash(buf []byte, seed uint64) uint64 {
// The runtime hasher only works on uintptr. For 64-bit
// architectures, we use the hasher directly. Otherwise,
// we use two parallel hashers on the lower and upper 32 bits.
if unsafe.Sizeof(uintptr(0)) == 8 {
if goarch.PtrSize == 8 {
return uint64(runtime_memhash(unsafe.Pointer(&buf[0]), uintptr(seed), uintptr(len)))
}
lo := runtime_memhash(unsafe.Pointer(&buf[0]), uintptr(seed), uintptr(len))
@@ -54,7 +55,7 @@ func comparableHash[T comparable](v T, seed Seed) uint64 {
} else {
hasher = (*abi.OldMapType)(unsafe.Pointer(mTyp)).Hasher
}
if unsafe.Sizeof(uintptr(0)) == 8 {
if goarch.PtrSize == 8 {
return uint64(hasher(abi.NoEscape(unsafe.Pointer(&v)), uintptr(s)))
}
lo := hasher(abi.NoEscape(unsafe.Pointer(&v)), uintptr(s))

0 comments on commit a1d62aa

Please sign in to comment.