diff options
| -rw-r--r-- | src/runtime/proc.go | 1 | ||||
| -rw-r--r-- | src/runtime/race/testdata/mop_test.go | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/src/runtime/proc.go b/src/runtime/proc.go index 3cecd1a057..9fd200ea32 100644 --- a/src/runtime/proc.go +++ b/src/runtime/proc.go @@ -4570,6 +4570,7 @@ func newproc1(fn *funcval, callergp *g, callerpc uintptr) *g { pp.goidcache++ if raceenabled { newg.racectx = racegostart(callerpc) + newg.raceignore = 0 if newg.labels != nil { // See note in proflabel.go on labelSync's role in synchronizing // with the reads in the signal handler. diff --git a/src/runtime/race/testdata/mop_test.go b/src/runtime/race/testdata/mop_test.go index 0da539fc01..6b1069fcca 100644 --- a/src/runtime/race/testdata/mop_test.go +++ b/src/runtime/race/testdata/mop_test.go @@ -2093,3 +2093,40 @@ func TestNoRaceTinyAlloc(t *testing.T) { <-done } } + +func TestNoRaceIssue60934(t *testing.T) { + // Test that runtime.RaceDisable state doesn't accidentally get applied to + // new goroutines. + + // Create several goroutines that end after calling runtime.RaceDisable. + var wg sync.WaitGroup + ready := make(chan struct{}) + wg.Add(32) + for i := 0; i < 32; i++ { + go func() { + <-ready // ensure we have multiple goroutines running at the same time + runtime.RaceDisable() + wg.Done() + }() + } + close(ready) + wg.Wait() + + // Make sure race detector still works. If the runtime.RaceDisable state + // leaks, the happens-before edges here will be ignored and a race on x will + // be reported. + var x int + ch := make(chan struct{}, 0) + wg.Add(2) + go func() { + x = 1 + ch <- struct{}{} + wg.Done() + }() + go func() { + <-ch + _ = x + wg.Done() + }() + wg.Wait() +} |