mirror of
https://github.com/golang/go
synced 2024-11-11 22:50:22 -07:00
cmd/compile: fix merge rules for panic calls
Use entire inlining call stack to decide whether two panic calls can be merged. We used to merge panic calls when only the leaf line numbers matched, but that leads to places higher up the call stack being merged incorrectly. Fixes #22083 Change-Id: Ia41400a80de4b6ecf3e5089abce0c42b65e9b38a Reviewed-on: https://go-review.googlesource.com/67632 Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
parent
d851f10b81
commit
41eabc0fc7
@ -277,7 +277,7 @@ type state struct {
|
||||
|
||||
type funcLine struct {
|
||||
f *obj.LSym
|
||||
file string
|
||||
base *src.PosBase
|
||||
line uint
|
||||
}
|
||||
|
||||
@ -3464,7 +3464,7 @@ func (s *state) check(cmp *ssa.Value, fn *obj.LSym) {
|
||||
bNext := s.f.NewBlock(ssa.BlockPlain)
|
||||
line := s.peekPos()
|
||||
pos := Ctxt.PosTable.Pos(line)
|
||||
fl := funcLine{f: fn, file: pos.Filename(), line: pos.Line()}
|
||||
fl := funcLine{f: fn, base: pos.Base(), line: pos.Line()}
|
||||
bPanic := s.panics[fl]
|
||||
if bPanic == nil {
|
||||
bPanic = s.f.NewBlock(ssa.BlockPlain)
|
||||
|
41
test/fixedbugs/issue22083.go
Normal file
41
test/fixedbugs/issue22083.go
Normal file
@ -0,0 +1,41 @@
|
||||
// run
|
||||
|
||||
// Copyright 2017 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.
|
||||
|
||||
// The compiler was panicking on the wrong line number, where
|
||||
// the panic was occurring in an inlined call.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"runtime/debug"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Wrapper struct {
|
||||
a []int
|
||||
}
|
||||
|
||||
func (w Wrapper) Get(i int) int {
|
||||
return w.a[i]
|
||||
}
|
||||
|
||||
func main() {
|
||||
defer func() {
|
||||
e := recover()
|
||||
if e == nil {
|
||||
panic("bounds check didn't fail")
|
||||
}
|
||||
stk := string(debug.Stack())
|
||||
if !strings.Contains(stk, "issue22083.go:40") {
|
||||
panic("wrong stack trace: " + stk)
|
||||
}
|
||||
}()
|
||||
foo := Wrapper{a: []int{0, 1, 2}}
|
||||
_ = foo.Get(0)
|
||||
_ = foo.Get(1)
|
||||
_ = foo.Get(2)
|
||||
_ = foo.Get(3) // stack trace should mention this line
|
||||
}
|
Loading…
Reference in New Issue
Block a user