-
Notifications
You must be signed in to change notification settings - Fork 17.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
Showing
2 changed files
with
43 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} |