From d1ac909e84c04f4326f620436b3894b3f5de0bd4 Mon Sep 17 00:00:00 2001 From: qiulaidongfeng <2645477756@qq.com> Date: Wed, 14 May 2025 21:43:26 +0800 Subject: [PATCH] sync/errgroup: PanicError.Error print stack trace Because it is useful to print the stack when a nil pointer dereference occurs. Fixes golang/go#73710 Change-Id: I106ea0bdd70c2a293f5ea889edef9b5ba9db2fbd Reviewed-on: https://go-review.googlesource.com/c/sync/+/672635 Reviewed-by: Damien Neil Auto-Submit: Damien Neil Auto-Submit: Alan Donovan Reviewed-by: Alan Donovan TryBot-Bypass: Damien Neil --- errgroup/errgroup.go | 5 +++-- errgroup/errgroup_test.go | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/errgroup/errgroup.go b/errgroup/errgroup.go index cfafed5..a6b6ad2 100644 --- a/errgroup/errgroup.go +++ b/errgroup/errgroup.go @@ -185,8 +185,9 @@ type PanicError struct { } func (p PanicError) Error() string { - // A Go Error method conventionally does not include a stack dump, so omit it - // here. (Callers who care can extract it from the Stack field.) + if len(p.Stack) > 0 { + return fmt.Sprintf("recovered from errgroup.Group: %v\n%s", p.Recovered, p.Stack) + } return fmt.Sprintf("recovered from errgroup.Group: %v", p.Recovered) } diff --git a/errgroup/errgroup_test.go b/errgroup/errgroup_test.go index 4684259..2165bb7 100644 --- a/errgroup/errgroup_test.go +++ b/errgroup/errgroup_test.go @@ -309,9 +309,9 @@ func TestPanic(t *testing.T) { if pe.Recovered != p { t.Fatalf("got %v, want %v", pe.Recovered, p) } - if !strings.Contains(string(pe.Stack), "TestPanic.func") { - t.Log(string(pe.Stack)) - t.Fatalf("stack trace incomplete") + if !strings.Contains(pe.Error(), "TestPanic.func") { + t.Log(pe.Error()) + t.Fatalf("stack trace incomplete, does not contain TestPanic.func") } }() g.Wait()