mirror of
https://github.com/golang/go.git
synced 2025-05-05 15:43:04 +00:00
reflect: fix _faststr optimization
CL 345486 introduced an optimization to reflect's map accesses which is not quite correct. We can't use the optimized code if the value type is >128 bytes. See cmd/compile/internal/walk/walk.go:mapfast Fixes #48357 Change-Id: I8e3c7858693083dd4393a8de48ca5fa47bab66f2 Reviewed-on: https://go-review.googlesource.com/c/go/+/349593 Trust: Keith Randall <khr@golang.org> Trust: Joe Tsai <joetsai@digital-static.net> Trust: Josh Bleecher Snyder <josharian@gmail.com> Trust: Martin Möhrmann <martin@golang.org> Run-TryBot: Keith Randall <khr@golang.org> Run-TryBot: Joe Tsai <joetsai@digital-static.net> Reviewed-by: Joe Tsai <joetsai@digital-static.net> Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com> Reviewed-by: Martin Möhrmann <martin@golang.org> TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
parent
c8a58f29dc
commit
ac40c9872f
@ -1517,7 +1517,7 @@ func (v Value) MapIndex(key Value) Value {
|
|||||||
// of unexported fields.
|
// of unexported fields.
|
||||||
|
|
||||||
var e unsafe.Pointer
|
var e unsafe.Pointer
|
||||||
if key.kind() == String && tt.key.Kind() == String {
|
if key.kind() == String && tt.key.Kind() == String && tt.elem.size <= maxValSize {
|
||||||
k := *(*string)(key.ptr)
|
k := *(*string)(key.ptr)
|
||||||
e = mapaccess_faststr(v.typ, v.pointer(), k)
|
e = mapaccess_faststr(v.typ, v.pointer(), k)
|
||||||
} else {
|
} else {
|
||||||
@ -2128,7 +2128,7 @@ func (v Value) SetMapIndex(key, elem Value) {
|
|||||||
key.mustBeExported()
|
key.mustBeExported()
|
||||||
tt := (*mapType)(unsafe.Pointer(v.typ))
|
tt := (*mapType)(unsafe.Pointer(v.typ))
|
||||||
|
|
||||||
if key.kind() == String && tt.key.Kind() == String {
|
if key.kind() == String && tt.key.Kind() == String && tt.elem.size <= maxValSize {
|
||||||
k := *(*string)(key.ptr)
|
k := *(*string)(key.ptr)
|
||||||
if elem.typ == nil {
|
if elem.typ == nil {
|
||||||
mapdelete_faststr(v.typ, v.pointer(), k)
|
mapdelete_faststr(v.typ, v.pointer(), k)
|
||||||
|
20
test/fixedbugs/issue48357.go
Normal file
20
test/fixedbugs/issue48357.go
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
// run
|
||||||
|
|
||||||
|
// Copyright 2021 The Go Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import "reflect"
|
||||||
|
|
||||||
|
type T [129]byte
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
m := map[string]T{}
|
||||||
|
v := reflect.ValueOf(m)
|
||||||
|
v.SetMapIndex(reflect.ValueOf("a"), reflect.ValueOf(T{}))
|
||||||
|
g = m["a"]
|
||||||
|
}
|
||||||
|
|
||||||
|
var g T
|
Loading…
x
Reference in New Issue
Block a user