Skip to content

Commit f9feaff

Browse files
committed
runtime: do not print runtime panic frame at top of user stack
The expected default behavior (no explicit GOTRACEBACK setting) is for the stack trace to start in user code, eliding unnecessary runtime frames that led up to the actual trace printing code. The idea was that the first line number printed was the one that crashed. For #5832 we added code to show 'panic' frames so that if code panics and then starts running defers and then we trace from there, the panic frame can help explain why the code seems to have made a call not present in the code. But that's only needed for panics between two different call frames, not the panic at the very top of the stack trace. Fix the fix to again elide the runtime code at the very top of the stack trace. Simple panic: package main func main() { var x []int println(x[1]) } Before this CL: panic: runtime error: index out of range goroutine 1 [running]: panic(0x1056980, 0x1091bf0) /Users/rsc/go/src/runtime/panic.go:531 +0x1cf main.main() /tmp/x.go:5 +0x5 After this CL: panic: runtime error: index out of range goroutine 1 [running]: main.main() /tmp/x.go:5 +0x5 Panic inside defer triggered by panic: package main func main() { var x []int defer func() { println(x[1]) }() println(x[2]) } Before this CL: panic: runtime error: index out of range panic: runtime error: index out of range goroutine 1 [running]: panic(0x1056aa0, 0x1091bf0) /Users/rsc/go/src/runtime/panic.go:531 +0x1cf main.main.func1(0x0, 0x0, 0x0) /tmp/y.go:6 +0x62 panic(0x1056aa0, 0x1091bf0) /Users/rsc/go/src/runtime/panic.go:489 +0x2cf main.main() /tmp/y.go:8 +0x59 The middle panic is important: it explains why main.main ended up calling main.main.func1 on a line that looks like a call to println. The top panic is noise. After this CL: panic: runtime error: index out of range panic: runtime error: index out of range goroutine 1 [running]: main.main.func1(0x0, 0x0, 0x0) /tmp/y.go:6 +0x62 panic(0x1056ac0, 0x1091bf0) /Users/rsc/go/src/runtime/panic.go:489 +0x2cf main.main() /tmp/y.go:8 +0x59 Fixes #17901. Change-Id: Id6d7c76373f7a658a537a39ca32b7dc23e1e76aa Reviewed-on: https://go-review.googlesource.com/33165 Run-TryBot: Russ Cox <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent ac1dbe6 commit f9feaff

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/runtime/crash_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ func TestPanicTraceback(t *testing.T) {
418418
}
419419

420420
// Check functions in the traceback.
421-
fns := []string{"panic", "main.pt1.func1", "panic", "main.pt2.func1", "panic", "main.pt2", "main.pt1"}
421+
fns := []string{"main.pt1.func1", "panic", "main.pt2.func1", "panic", "main.pt2", "main.pt1"}
422422
for _, fn := range fns {
423423
re := regexp.MustCompile(`(?m)^` + regexp.QuoteMeta(fn) + `\(.*\n`)
424424
idx := re.FindStringIndex(output)

src/runtime/traceback.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ func gentraceback(pc0, sp0, lr0 uintptr, gp *g, skip int, pcbuf *uintptr, max in
380380
}
381381
}
382382
if printing {
383-
if (flags&_TraceRuntimeFrames) != 0 || showframe(f, gp) {
383+
if (flags&_TraceRuntimeFrames) != 0 || showframe(f, gp, nprint == 0) {
384384
// Print during crash.
385385
// main(0x1, 0x2, 0x3)
386386
// /home/rsc/go/src/runtime/x.go:23 +0xf
@@ -632,7 +632,7 @@ func printcreatedby(gp *g) {
632632
// Show what created goroutine, except main goroutine (goid 1).
633633
pc := gp.gopc
634634
f := findfunc(pc)
635-
if f != nil && showframe(f, gp) && gp.goid != 1 {
635+
if f != nil && showframe(f, gp, false) && gp.goid != 1 {
636636
print("created by ", funcname(f), "\n")
637637
tracepc := pc // back up to CALL instruction for funcline.
638638
if pc > f.entry {
@@ -712,18 +712,20 @@ func gcallers(gp *g, skip int, pcbuf []uintptr) int {
712712
return gentraceback(^uintptr(0), ^uintptr(0), 0, gp, skip, &pcbuf[0], len(pcbuf), nil, nil, 0)
713713
}
714714

715-
func showframe(f *_func, gp *g) bool {
715+
func showframe(f *_func, gp *g, firstFrame bool) bool {
716716
g := getg()
717717
if g.m.throwing > 0 && gp != nil && (gp == g.m.curg || gp == g.m.caughtsig.ptr()) {
718718
return true
719719
}
720720
level, _, _ := gotraceback()
721721
name := funcname(f)
722722

723-
// Special case: always show runtime.gopanic frame, so that we can
724-
// see where a panic started in the middle of a stack trace.
723+
// Special case: always show runtime.gopanic frame
724+
// in the middle of a stack trace, so that we can
725+
// see the boundary between ordinary code and
726+
// panic-induced deferred code.
725727
// See golang.org/issue/5832.
726-
if name == "runtime.gopanic" {
728+
if name == "runtime.gopanic" && !firstFrame {
727729
return true
728730
}
729731

0 commit comments

Comments
 (0)