From 8f74f9daf4d2fe708cf28d0e2b9cce079fa19248 Mon Sep 17 00:00:00 2001 From: Nicolas Hillegeer Date: Tue, 21 Oct 2025 04:43:36 -0700 Subject: [PATCH] sync: re-enable race even when panicking Not doing this can cause user code running after this panic (e.g.: defers) to produce non-existing races. Change-Id: Ia6aec88aaeee3b9c17e7b8019d697ffa88dfb492 Reviewed-on: https://go-review.googlesource.com/c/go/+/713460 Commit-Queue: Nicolas Hillegeer Reviewed-by: Michael Pratt Auto-Submit: Nicolas Hillegeer Reviewed-by: Michael Knyszek LUCI-TryBot-Result: Go LUCI --- src/sync/waitgroup.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/sync/waitgroup.go b/src/sync/waitgroup.go index 5b035aa396..195f839da4 100644 --- a/src/sync/waitgroup.go +++ b/src/sync/waitgroup.go @@ -204,13 +204,14 @@ func (wg *WaitGroup) Wait() { } } runtime_SemacquireWaitGroup(&wg.sema, synctestDurable) - if wg.state.Load() != 0 { - panic("sync: WaitGroup is reused before previous Wait has returned") - } + isReset := wg.state.Load() != 0 if race.Enabled { race.Enable() race.Acquire(unsafe.Pointer(wg)) } + if isReset { + panic("sync: WaitGroup is reused before previous Wait has returned") + } return } } -- 2.52.0