[release-branch.go1.13] cmd/go/internal/modget: synchronize writes to modOnly map...

Adds an additional lock around an access to modOnly.

Updates #35317
Fixes #35318

Change-Id: Ia1e75f9a674ec2a2c0489b41283c1cd3e7924d1e
Reviewed-on: https://go-review.googlesource.com/c/go/+/209237
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
(cherry picked from commit 9174e2c03c423a47bf052b8a1aa844f3378eccd4)
Reviewed-on: https://go-review.googlesource.com/c/go/+/209222
Run-TryBot: Alexander Rakoczy <alex@golang.org>

diff --git a/src/cmd/go/internal/modget/get.go b/src/cmd/go/internal/modget/get.go
index d234a1eb0b99603f390851e9129342335ba85436..314019f125a84a6a31383c0c0db64d9f7e6c01e3 100644 (file)
--- a/src/cmd/go/internal/modget/get.go
+++ b/src/cmd/go/internal/modget/get.go
@@ -456,7 +456,9 @@ func runGet(cmd *base.Command, args []string) {
        modOnly := make(map[string]*query)
        for _, q := range queries {
                if q.m.Version == "none" {
+                       modOnlyMu.Lock()
                        modOnly[q.m.Path] = q
+                       modOnlyMu.Unlock()
                        continue
                }
                if q.path == q.m.Path {

diff --git a/src/cmd/go/testdata/script/mod_issue35317.txt b/src/cmd/go/testdata/script/mod_issue35317.txt
index 003390b7109992b08bddbb4be34fdde04bdbf360..92416a54e474e0a8bb22c6422e1dd2a2fca01154 100644 (file)
--- a/src/cmd/go/testdata/script/mod_issue35317.txt
+++ b/src/cmd/go/testdata/script/mod_issue35317.txt
@@ -5,4 +5,4 @@ env GO111MODULE=on
 [short] skip
 
 go mod init example.com
-go get golang.org/x/text@v0.3.0 golang.org/x/internal@v0.1.0
+go get golang.org/x/text@v0.3.0 golang.org/x/internal@v0.1.0 golang.org/x/exp@none