qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 16:07:00 -07:00
Code Releases Activity

hash/maphash: simplify pointer size checks

Browse Source 
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>
This commit is contained in:
Cherry Mui 2024-11-21 15:42:48 -05:00 committed by Gopher Robot
parent efe0a86551
commit a1d62aa475
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hash/maphash/maphash_runtime.go
View File

@ -8,6 +8,7 @@ package maphash
import ( import (
"internal/abi" "internal/abi"
"internal/goarch"
"internal/goexperiment" "internal/goexperiment"
"unsafe" "unsafe"
) )
@ -27,7 +28,7 @@ func rthash(buf []byte, seed uint64) uint64 {
// The runtime hasher only works on uintptr. For 64-bit // The runtime hasher only works on uintptr. For 64-bit
// architectures, we use the hasher directly. Otherwise, // architectures, we use the hasher directly. Otherwise,
// we use two parallel hashers on the lower and upper 32 bits. // 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))) return uint64(runtime_memhash(unsafe.Pointer(&buf[0]), uintptr(seed), uintptr(len)))
} }
lo := 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 { } else {
hasher = (*abi.OldMapType)(unsafe.Pointer(mTyp)).Hasher 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))) return uint64(hasher(abi.NoEscape(unsafe.Pointer(&v)), uintptr(s)))
} }
lo := hasher(abi.NoEscape(unsafe.Pointer(&v)), uintptr(s)) lo := hasher(abi.NoEscape(unsafe.Pointer(&v)), uintptr(s))