reflect: use MapMaxKeyBytes,MapMaxElemBytes,MapBucketCount of internal/abi

For #59670

Change-Id: I63a6e2cfaf9eec03866ea61064164a059fc42bb2
GitHub-Last-Rev: a3aa46a36444b08382ddac79c10a064b314bd971
GitHub-Pull-Request: golang/go#64773
Reviewed-on: https://go-review.googlesource.com/c/go/+/550595
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>

diff --git a/src/reflect/type.go b/src/reflect/type.go
index 110e2c9d198c9cf5d005642b14e1dfa340e4a41f..a1a618ad598f48a809a12ca3dc19344e85725022 100644 (file)
--- a/src/reflect/type.go
+++ b/src/reflect/type.go
@@ -1694,13 +1694,13 @@ func MapOf(key, elem Type) Type {
                return typehash(ktyp, p, seed)
        }
        mt.Flags = 0
-       if ktyp.Size_ > maxKeySize {
+       if ktyp.Size_ > abi.MapMaxKeyBytes {
                mt.KeySize = uint8(goarch.PtrSize)
                mt.Flags |= 1 // indirect key
        } else {
                mt.KeySize = uint8(ktyp.Size_)
        }
-       if etyp.Size_ > maxValSize {
+       if etyp.Size_ > abi.MapMaxElemBytes {
                mt.ValueSize = uint8(goarch.PtrSize)
                mt.Flags |= 2 // indirect value
        } else {
@@ -1954,21 +1954,11 @@ func hashMightPanic(t *abi.Type) bool {
        }
 }
 
-// Make sure these routines stay in sync with ../runtime/map.go!
-// These types exist only for GC, so we only fill out GC relevant info.
-// Currently, that's just size and the GC program. We also fill in string
-// for possible debugging use.
-const (
-       bucketSize uintptr = abi.MapBucketCount
-       maxKeySize uintptr = abi.MapMaxKeyBytes
-       maxValSize uintptr = abi.MapMaxElemBytes
-)
-
 func bucketOf(ktyp, etyp *abi.Type) *abi.Type {
-       if ktyp.Size_ > maxKeySize {
+       if ktyp.Size_ > abi.MapMaxKeyBytes {
                ktyp = ptrTo(ktyp)
        }
-       if etyp.Size_ > maxValSize {
+       if etyp.Size_ > abi.MapMaxElemBytes {
                etyp = ptrTo(etyp)
        }
 
@@ -1980,29 +1970,29 @@ func bucketOf(ktyp, etyp *abi.Type) *abi.Type {
        var gcdata *byte
        var ptrdata uintptr
 
-       size := bucketSize*(1+ktyp.Size_+etyp.Size_) + goarch.PtrSize
+       size := abi.MapBucketCount*(1+ktyp.Size_+etyp.Size_) + goarch.PtrSize
        if size&uintptr(ktyp.Align_-1) != 0 || size&uintptr(etyp.Align_-1) != 0 {
                panic("reflect: bad size computation in MapOf")
        }
 
        if ktyp.PtrBytes != 0 || etyp.PtrBytes != 0 {
-               nptr := (bucketSize*(1+ktyp.Size_+etyp.Size_) + goarch.PtrSize) / goarch.PtrSize
+               nptr := (abi.MapBucketCount*(1+ktyp.Size_+etyp.Size_) + goarch.PtrSize) / goarch.PtrSize
                n := (nptr + 7) / 8
 
                // Runtime needs pointer masks to be a multiple of uintptr in size.
                n = (n + goarch.PtrSize - 1) &^ (goarch.PtrSize - 1)
                mask := make([]byte, n)
-               base := bucketSize / goarch.PtrSize
+               base := uintptr(abi.MapBucketCount / goarch.PtrSize)
 
                if ktyp.PtrBytes != 0 {
-                       emitGCMask(mask, base, ktyp, bucketSize)
+                       emitGCMask(mask, base, ktyp, abi.MapBucketCount)
                }
-               base += bucketSize * ktyp.Size_ / goarch.PtrSize
+               base += abi.MapBucketCount * ktyp.Size_ / goarch.PtrSize
 
                if etyp.PtrBytes != 0 {
-                       emitGCMask(mask, base, etyp, bucketSize)
+                       emitGCMask(mask, base, etyp, abi.MapBucketCount)
                }
-               base += bucketSize * etyp.Size_ / goarch.PtrSize
+               base += abi.MapBucketCount * etyp.Size_ / goarch.PtrSize
 
                word := base
                mask[word/8] |= 1 << (word % 8)

diff --git a/src/reflect/value.go b/src/reflect/value.go
index 8f163fce161b7791a5dffbb310cfdc7668dbdfee..60ba79a6e68bab3a2d6f2af518134a977a3c7509 100644 (file)
--- a/src/reflect/value.go
+++ b/src/reflect/value.go
@@ -1811,7 +1811,7 @@ func (v Value) MapIndex(key Value) Value {
        // of unexported fields.
 
        var e unsafe.Pointer
-       if (tt.Key == stringType || key.kind() == String) && tt.Key == key.typ() && tt.Elem.Size() <= maxValSize {
+       if (tt.Key == stringType || key.kind() == String) && tt.Key == key.typ() && tt.Elem.Size() <= abi.MapMaxElemBytes {
                k := *(*string)(key.ptr)
                e = mapaccess_faststr(v.typ(), v.pointer(), k)
        } else {
@@ -2447,7 +2447,7 @@ func (v Value) SetMapIndex(key, elem Value) {
        key.mustBeExported()
        tt := (*mapType)(unsafe.Pointer(v.typ()))
 
-       if (tt.Key == stringType || key.kind() == String) && tt.Key == key.typ() && tt.Elem.Size() <= maxValSize {
+       if (tt.Key == stringType || key.kind() == String) && tt.Key == key.typ() && tt.Elem.Size() <= abi.MapMaxElemBytes {
                k := *(*string)(key.ptr)
                if elem.typ() == nil {
                        mapdelete_faststr(v.typ(), v.pointer(), k)