mirror of
https://github.com/golang/go
synced 2024-11-11 19:21:37 -07:00
cmd/compile: ensure FuncForPC works on closures that start with NOPs
A 0-sized no-op shouldn't prevent us from detecting that the first instruction is from an inlined callee. Update #58300 Change-Id: Ic5f6ed108c54a32c05e9b2264b516f2cc17e4619 Reviewed-on: https://go-review.googlesource.com/c/go/+/467977 Run-TryBot: Keith Randall <khr@golang.org> Reviewed-by: Keith Randall <khr@google.com> Reviewed-by: David Chase <drchase@google.com> TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
parent
5e74bc1a08
commit
cbb9cd03f8
@ -7171,7 +7171,7 @@ func genssa(f *ssa.Func, pp *objw.Progs) {
|
||||
// This ensures that runtime.FuncForPC(uintptr(reflect.ValueOf(fn).Pointer())).Name()
|
||||
// returns the right answer. See issue 58300.
|
||||
for p := pp.Text; p != nil; p = p.Link {
|
||||
if p.As == obj.AFUNCDATA || p.As == obj.APCDATA || p.As == obj.ATEXT {
|
||||
if p.As == obj.AFUNCDATA || p.As == obj.APCDATA || p.As == obj.ATEXT || p.As == obj.ANOP {
|
||||
continue
|
||||
}
|
||||
if base.Ctxt.PosTable.Pos(p.Pos).Base().InliningIndex() >= 0 {
|
||||
|
35
test/fixedbugs/issue58300b.go
Normal file
35
test/fixedbugs/issue58300b.go
Normal file
@ -0,0 +1,35 @@
|
||||
// run
|
||||
|
||||
// Copyright 2023 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"
|
||||
"runtime"
|
||||
)
|
||||
|
||||
type T struct {
|
||||
a, b int
|
||||
}
|
||||
|
||||
func f(t *T) int {
|
||||
if t != nil {
|
||||
return t.b
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func g(t *T) int {
|
||||
return f(t) + 5
|
||||
}
|
||||
|
||||
func main() {
|
||||
x(f)
|
||||
x(g)
|
||||
}
|
||||
func x(v any) {
|
||||
println(runtime.FuncForPC(reflect.ValueOf(v).Pointer()).Name())
|
||||
}
|
2
test/fixedbugs/issue58300b.out
Normal file
2
test/fixedbugs/issue58300b.out
Normal file
@ -0,0 +1,2 @@
|
||||
main.f
|
||||
main.g
|
Loading…
Reference in New Issue
Block a user