From ed993dbe2445c4797303138b62f6c7e26050dcd4 Mon Sep 17 00:00:00 2001
From: Abirdcfly <fp544037857@gmail.com>
Date: Wed, 7 Sep 2022 00:18:33 +0800
Subject: [PATCH] cmd/go/internal/modload: change Requirements.graph type to
atomic.Pointer[cachedGraph]
---
src/cmd/go/internal/modload/buildlist.go | 10 +++++-----
src/cmd/go/internal/modload/load.go | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/cmd/go/internal/modload/buildlist.go b/src/cmd/go/internal/modload/buildlist.go
index cde4953afa2250..aa59611e8193ac 100644
--- a/src/cmd/go/internal/modload/buildlist.go
+++ b/src/cmd/go/internal/modload/buildlist.go
@@ -73,8 +73,8 @@ type Requirements struct {
// nested module back into a parent module).
direct map[string]bool
- graphOnce sync.Once // guards writes to (but not reads from) graph
- graph atomic.Value // cachedGraph
+ graphOnce sync.Once // guards writes to (but not reads from) graph
+ graph atomic.Pointer[cachedGraph]
}
// A cachedGraph is a non-nil *ModuleGraph, together with any error discovered
@@ -199,7 +199,7 @@ func (rs *Requirements) initVendor(vendorList []module.Version) {
mg.g.Require(vendorMod, vendorList)
}
- rs.graph.Store(cachedGraph{mg, nil})
+ rs.graph.Store(&cachedGraph{mg, nil})
})
}
@@ -240,9 +240,9 @@ func (rs *Requirements) hasRedundantRoot() bool {
func (rs *Requirements) Graph(ctx context.Context) (*ModuleGraph, error) {
rs.graphOnce.Do(func() {
mg, mgErr := readModGraph(ctx, rs.pruning, rs.rootModules)
- rs.graph.Store(cachedGraph{mg, mgErr})
+ rs.graph.Store(&cachedGraph{mg, mgErr})
})
- cached := rs.graph.Load().(cachedGraph)
+ cached := rs.graph.Load()
return cached.mg, cached.err
}
diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go
index 69b0c30978da0e..060d0cb21a01dc 100644
--- a/src/cmd/go/internal/modload/load.go
+++ b/src/cmd/go/internal/modload/load.go
@@ -1837,7 +1837,7 @@ func (ld *loader) computePatternAll() (all []string) {
func (ld *loader) checkMultiplePaths() {
mods := ld.requirements.rootModules
if cached := ld.requirements.graph.Load(); cached != nil {
- if mg := cached.(cachedGraph).mg; mg != nil {
+ if mg := cached.mg; mg != nil {
mods = mg.BuildList()
}
}