From: Ian Alexander <jitsu@google.com>
Date: Thu, 16 Oct 2025 22:09:57 +0000 (-0400)
Subject: cmd/go: make Reset work with any State instance
X-Git-Tag: go1.26rc1~578
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0d3044f965;p=gostls13.git

cmd/go: make Reset work with any State instance

This commit updates the Reset function to work with any state
object in preparation for converting it to a method.

This commit is part of the overall effort to eliminate global
modloader state.

Change-Id: I6103842ea0a0528698217930afc0e34a2aa21eea
Reviewed-on: https://go-review.googlesource.com/c/go/+/712701
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Michael Matloob <matloob@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
---

diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go
index 34af9796e5..d250d65671 100644
--- a/src/cmd/go/internal/modload/init.go
+++ b/src/cmd/go/internal/modload/init.go
@@ -377,8 +377,8 @@ func WorkFilePath(loaderstate *State) string {
 
 // Reset clears all the initialized, cached state about the use of modules,
 // so that we can start over.
-func Reset() {
-	setState(LoaderState, State{})
+func Reset(s *State) {
+	setState(s, State{})
 }
 
 func setState(s *State, new State) State {
diff --git a/src/cmd/go/internal/toolchain/select.go b/src/cmd/go/internal/toolchain/select.go
index d54277ed1b..b42f3dce05 100644
--- a/src/cmd/go/internal/toolchain/select.go
+++ b/src/cmd/go/internal/toolchain/select.go
@@ -352,7 +352,7 @@ func Exec(gotoolchain string) {
 	}
 
 	// Set up modules without an explicit go.mod, to download distribution.
-	modload.Reset()
+	modload.Reset(modload.LoaderState)
 	modload.LoaderState.ForceUseModules = true
 	modload.LoaderState.RootMode = modload.NoRoot
 	modload.Init(modload.LoaderState)
@@ -695,7 +695,7 @@ func maybeSwitchForGoInstallVersion(minVers string) {
 	modload.LoaderState.ForceUseModules = true
 	modload.LoaderState.RootMode = modload.NoRoot
 	modload.Init(modload.LoaderState)
-	defer modload.Reset()
+	defer modload.Reset(modload.LoaderState)
 
 	// See internal/load.PackagesAndErrorsOutsideModule
 	ctx := context.Background()