cmd/go: fix data race in TestScript

cuiweixie · cuiweixie · commit 6ed20f7dc449 · 2022-08-13T13:16:00.000+08:00
Fixes golang#54423
diff --git a/src/cmd/go/internal/base/base.go b/src/cmd/go/internal/base/base.go
@@ -105,15 +105,20 @@ func (c *Command) Runnable() bool {
 }
 
 var atExitFuncs []func()
+var atExitFuncsLock sync.Mutex
 
 func AtExit(f func()) {
+	atExitFuncsLock.Lock()
+	defer atExitFuncsLock.Unlock()
 	atExitFuncs = append(atExitFuncs, f)
 }
 
 func Exit() {
+	atExitFuncsLock.Lock()
 	for _, f := range atExitFuncs {
 		f()
 	}
+	atExitFuncsLock.Unlock()
 	os.Exit(exitStatus)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -105,15 +105,20 @@ func (c *Command) Runnable() bool {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`var atExitFuncs []func()`
	`108`	`+var atExitFuncsLock sync.Mutex`
`108`	`109`
`109`	`110`	`func AtExit(f func()) {`
	`111`	`+ atExitFuncsLock.Lock()`
	`112`	`+ defer atExitFuncsLock.Unlock()`
`110`	`113`	`atExitFuncs = append(atExitFuncs, f)`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`func Exit() {`
	`117`	`+ atExitFuncsLock.Lock()`
`114`	`118`	`for _, f := range atExitFuncs {`
`115`	`119`	`f()`
`116`	`120`	`}`
	`121`	`+ atExitFuncsLock.Unlock()`
`117`	`122`	`os.Exit(exitStatus)`
`118`	`123`	`}`
`119`	`124`