cmd/go: fix data race in TestScript

cuiweixie · cuiweixie · commit 13faa5cae126 · 2022-08-14T10:52:17.000+08:00
Fixes golang#54423
diff --git a/src/cmd/go/internal/base/base.go b/src/cmd/go/internal/base/base.go
@@ -104,16 +104,23 @@ func (c *Command) Runnable() bool {
 	return c.Run != nil
 }
 
-var atExitFuncs []func()
+var (
+	atExitFuncsLock sync.Mutex
+	atExitFuncs     []func()
+)
 
 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
`@@ -104,16 +104,23 @@ func (c *Command) Runnable() bool {`
`104`	`104`	`return c.Run != nil`
`105`	`105`	`}`
`106`	`106`
`107`		`-var atExitFuncs []func()`
	`107`	`+var (`
	`108`	`+ atExitFuncsLock sync.Mutex`
	`109`	`+ atExitFuncs []func()`
	`110`	`+)`
`108`	`111`
`109`	`112`	`func AtExit(f func()) {`
	`113`	`+ atExitFuncsLock.Lock()`
	`114`	`+ defer atExitFuncsLock.Unlock()`
`110`	`115`	`atExitFuncs = append(atExitFuncs, f)`
`111`	`116`	`}`
`112`	`117`
`113`	`118`	`func Exit() {`
	`119`	`+ atExitFuncsLock.Lock()`
`114`	`120`	`for _, f := range atExitFuncs {`
`115`	`121`	`f()`
`116`	`122`	`}`
	`123`	`+ atExitFuncsLock.Unlock()`
`117`	`124`	`os.Exit(exitStatus)`
`118`	`125`	`}`
`119`	`126`