cmd/go: fix build config before creating actions for 'go list -cover'

cixel · gopherbot · commit ac08c05d4daa · 2024-02-01T22:47:28.000Z
When -covermode is set to atomic, instrumented packages need to import sync/atomic. If this is not already imported by a package being instrumented, the build needs to ensure that sync/atomic is compiled whenever 'go list' is run in a way that triggers package builds. The build config was already being made to ensure the import, but only after the action graph had been created, so there was no guarantee that sync/atomic would be built when needed. Fixes #65264. Change-Id: Ib3f1e102ce2ef554ea08330d9db69a8c98790ac5 Reviewed-on: https://go-review.googlesource.com/c/go/+/560236 Run-TryBot: Bryan Mills <bcmills@google.com> Auto-Submit: Bryan Mills <bcmills@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Bryan Mills <bcmills@google.com> Reviewed-by: Michael Matloob <matloob@golang.org>
diff --git a/src/cmd/go/internal/list/list.go b/src/cmd/go/internal/list/list.go
@@ -725,16 +725,16 @@ func runList(ctx context.Context, cmd *base.Command, args []string) {
 		b.IsCmdList = true
 		b.NeedExport = *listExport
 		b.NeedCompiledGoFiles = *listCompiled
+		if cfg.Experiment.CoverageRedesign && cfg.BuildCover {
+			load.PrepareForCoverageBuild(pkgs)
+		}
 		a := &work.Action{}
 		// TODO: Use pkgsFilter?
 		for _, p := range pkgs {
 			if len(p.GoFiles)+len(p.CgoFiles) > 0 {
 				a.Deps = append(a.Deps, b.AutoAction(work.ModeInstall, work.ModeInstall, p))
 			}
 		}
-		if cfg.Experiment.CoverageRedesign && cfg.BuildCover {
-			load.PrepareForCoverageBuild(pkgs)
-		}
 		b.Do(ctx, a)
 	}
 
diff --git a/src/cmd/go/testdata/script/cover_list.txt b/src/cmd/go/testdata/script/cover_list.txt
@@ -38,6 +38,10 @@ cp stdout $WORK/toolbuildid.txt
 # Build IDs should match here.
 cmp $WORK/toolbuildid.txt $WORK/listbuildid.txt
 
+# Make sure that the build succeeds regardless of covermode.
+go list -export -covermode=atomic m/example
+go list -export -covermode=count m/example
+
 -- go.mod --
 module m
 

Original file line number	Diff line number	Diff line change
`@@ -725,16 +725,16 @@ func runList(ctx context.Context, cmd *base.Command, args []string) {`
`725`	`725`	`b.IsCmdList = true`
`726`	`726`	`b.NeedExport = *listExport`
`727`	`727`	`b.NeedCompiledGoFiles = *listCompiled`
	`728`	`+ if cfg.Experiment.CoverageRedesign && cfg.BuildCover {`
	`729`	`+ load.PrepareForCoverageBuild(pkgs)`
	`730`	`+ }`
`728`	`731`	`a := &work.Action{}`
`729`	`732`	`// TODO: Use pkgsFilter?`
`730`	`733`	`for _, p := range pkgs {`
`731`	`734`	`if len(p.GoFiles)+len(p.CgoFiles) > 0 {`
`732`	`735`	`a.Deps = append(a.Deps, b.AutoAction(work.ModeInstall, work.ModeInstall, p))`
`733`	`736`	`}`
`734`	`737`	`}`
`735`		`- if cfg.Experiment.CoverageRedesign && cfg.BuildCover {`
`736`		`- load.PrepareForCoverageBuild(pkgs)`
`737`		`- }`
`738`	`738`	`b.Do(ctx, a)`
`739`	`739`	`}`
`740`	`740`