diff options
Diffstat (limited to 'src/runtime/map_faststr.go')
| -rw-r--r-- | src/runtime/map_faststr.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/runtime/map_faststr.go b/src/runtime/map_faststr.go index d989190f71..38841aee4b 100644 --- a/src/runtime/map_faststr.go +++ b/src/runtime/map_faststr.go @@ -16,7 +16,7 @@ func mapaccess1_faststr(t *maptype, h *hmap, ky string) unsafe.Pointer { racereadpc(unsafe.Pointer(h), callerpc, abi.FuncPCABIInternal(mapaccess1_faststr)) } if h == nil || h.count == 0 { - return unsafe.Pointer(&zeroVal[0]) + return unsafe.Pointer(&abi.ZeroVal[0]) } if h.flags&hashWriting != 0 { fatal("concurrent map read and map write") @@ -39,7 +39,7 @@ func mapaccess1_faststr(t *maptype, h *hmap, ky string) unsafe.Pointer { return add(unsafe.Pointer(b), dataOffset+abi.MapBucketCount*2*goarch.PtrSize+i*uintptr(t.ValueSize)) } } - return unsafe.Pointer(&zeroVal[0]) + return unsafe.Pointer(&abi.ZeroVal[0]) } // long key, try not to do more comparisons than necessary keymaybe := uintptr(abi.MapBucketCount) @@ -74,7 +74,7 @@ func mapaccess1_faststr(t *maptype, h *hmap, ky string) unsafe.Pointer { return add(unsafe.Pointer(b), dataOffset+abi.MapBucketCount*2*goarch.PtrSize+keymaybe*uintptr(t.ValueSize)) } } - return unsafe.Pointer(&zeroVal[0]) + return unsafe.Pointer(&abi.ZeroVal[0]) } dohash: hash := t.Hasher(noescape(unsafe.Pointer(&ky)), uintptr(h.hash0)) @@ -102,7 +102,7 @@ dohash: } } } - return unsafe.Pointer(&zeroVal[0]) + return unsafe.Pointer(&abi.ZeroVal[0]) } func mapaccess2_faststr(t *maptype, h *hmap, ky string) (unsafe.Pointer, bool) { @@ -111,7 +111,7 @@ func mapaccess2_faststr(t *maptype, h *hmap, ky string) (unsafe.Pointer, bool) { racereadpc(unsafe.Pointer(h), callerpc, abi.FuncPCABIInternal(mapaccess2_faststr)) } if h == nil || h.count == 0 { - return unsafe.Pointer(&zeroVal[0]), false + return unsafe.Pointer(&abi.ZeroVal[0]), false } if h.flags&hashWriting != 0 { fatal("concurrent map read and map write") @@ -134,7 +134,7 @@ func mapaccess2_faststr(t *maptype, h *hmap, ky string) (unsafe.Pointer, bool) { return add(unsafe.Pointer(b), dataOffset+abi.MapBucketCount*2*goarch.PtrSize+i*uintptr(t.ValueSize)), true } } - return unsafe.Pointer(&zeroVal[0]), false + return unsafe.Pointer(&abi.ZeroVal[0]), false } // long key, try not to do more comparisons than necessary keymaybe := uintptr(abi.MapBucketCount) @@ -169,7 +169,7 @@ func mapaccess2_faststr(t *maptype, h *hmap, ky string) (unsafe.Pointer, bool) { return add(unsafe.Pointer(b), dataOffset+abi.MapBucketCount*2*goarch.PtrSize+keymaybe*uintptr(t.ValueSize)), true } } - return unsafe.Pointer(&zeroVal[0]), false + return unsafe.Pointer(&abi.ZeroVal[0]), false } dohash: hash := t.Hasher(noescape(unsafe.Pointer(&ky)), uintptr(h.hash0)) @@ -197,7 +197,7 @@ dohash: } } } - return unsafe.Pointer(&zeroVal[0]), false + return unsafe.Pointer(&abi.ZeroVal[0]), false } func mapassign_faststr(t *maptype, h *hmap, s string) unsafe.Pointer { |