mirror of
https://github.com/golang/go.git
synced 2025-05-05 15:43:04 +00:00
cmd/compile: fix wrong unsafe.Offsetof evaluation inside generic function
For instantiated generic functions, all implicit dot operations are resolved. Thus unsafe.Offsetof may calculating the offset against the wrong base selector. To fix it, we must remove any implicit dot operations to find the first non-implicit one, which is the right base selector for calculating the offset. Fixes #53137 Change-Id: I38504067ce0f274615b306edc8f7d7933bdb631a Reviewed-on: https://go-review.googlesource.com/c/go/+/409355 Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com> Reviewed-by: Keith Randall <khr@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Keith Randall <khr@golang.org>
This commit is contained in:
parent
cfd202c701
commit
085529bd5f
@ -805,6 +805,18 @@ func evalunsafe(n ir.Node) int64 {
|
|||||||
sel.X = Expr(sel.X)
|
sel.X = Expr(sel.X)
|
||||||
sbase := sel.X
|
sbase := sel.X
|
||||||
|
|
||||||
|
// Implicit dot may already be resolved for instantiating generic function. So we
|
||||||
|
// need to remove any implicit dot until we reach the first non-implicit one, it's
|
||||||
|
// the right base selector. See issue #53137.
|
||||||
|
var clobberBase func(n ir.Node) ir.Node
|
||||||
|
clobberBase = func(n ir.Node) ir.Node {
|
||||||
|
if sel, ok := n.(*ir.SelectorExpr); ok && sel.Implicit() {
|
||||||
|
return clobberBase(sel.X)
|
||||||
|
}
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
sbase = clobberBase(sbase)
|
||||||
|
|
||||||
tsel := Expr(sel)
|
tsel := Expr(sel)
|
||||||
n.X = tsel
|
n.X = tsel
|
||||||
if tsel.Type() == nil {
|
if tsel.Type() == nil {
|
||||||
|
32
test/fixedbugs/issue53137.go
Normal file
32
test/fixedbugs/issue53137.go
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
// run
|
||||||
|
|
||||||
|
// Copyright 2022 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 (
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Embedded struct {
|
||||||
|
B int
|
||||||
|
}
|
||||||
|
|
||||||
|
type S[K any] struct {
|
||||||
|
A K
|
||||||
|
Embedded
|
||||||
|
}
|
||||||
|
|
||||||
|
func showOffsets[K any](d *S[K]) {
|
||||||
|
o1 := unsafe.Offsetof(d.B)
|
||||||
|
o2 := unsafe.Offsetof(d.Embedded)
|
||||||
|
if o1 != o2 {
|
||||||
|
panic("offset mismatch")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
showOffsets(new(S[int]))
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user