cmd/go: make ImportMissingError work with local state

This change adds fields to the type `ImportMissingError` so
that the `Error()` method can be called without accessing the global
`LoaderState` variable.

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

Change-Id: Ib313faeb27ae44e9ac68086313633ce742f596dd
Reviewed-on: https://go-review.googlesource.com/c/go/+/711121
LUCI-TryBot-Result: Go LUCI <[email protected]>
Reviewed-by: Michael Matloob <[email protected]>
Reviewed-by: Michael Matloob <[email protected]>

Author: jitsu-net

src/cmd/go/internal/modload/import.go

@@ -29,10 +29,14 @@ import (
 )
 
 type ImportMissingError struct {
-	Path     string
-	Module   module.Version
-	QueryErr error
-
+	Path             string
+	Module           module.Version
+	QueryErr         error
+	modContainingCWD module.Version
+
+	// modRoot is dependent on the value of ImportingMainModule and should be
+	// kept in sync.
+	modRoot             string
 	ImportingMainModule module.Version
 
 	// isStd indicates whether we would expect to find the package in the standard
@@ -82,8 +86,8 @@ func (e *ImportMissingError) Error() string {
 		if e.QueryErr != nil {
 			return fmt.Sprintf("%s: %v", message, e.QueryErr)
 		}
-		if e.ImportingMainModule.Path != "" && e.ImportingMainModule != LoaderState.MainModules.ModContainingCWD() {
-			return fmt.Sprintf("%s; to add it:\n\tcd %s\n\tgo get %s", message, LoaderState.MainModules.ModRoot(e.ImportingMainModule), e.Path)
+		if e.ImportingMainModule.Path != "" && e.ImportingMainModule != e.modContainingCWD {
+			return fmt.Sprintf("%s; to add it:\n\tcd %s\n\tgo get %s", message, e.modRoot, e.Path)
 		}
 		return fmt.Sprintf("%s; to add it:\n\tgo get %s", message, e.Path)
 	}
@@ -368,7 +372,10 @@ func importFromModules(loaderstate *State, ctx context.Context, path string, rs
 		}
 
 		if len(mods) == 0 {
-			return module.Version{}, "", "", nil, &ImportMissingError{Path: path}
+			return module.Version{}, "", "", nil, &ImportMissingError{
+				Path:             path,
+				modContainingCWD: loaderstate.MainModules.ModContainingCWD(),
+			}
 		}
 
 		return mods[0], roots[0], dirs[0], nil, nil
@@ -486,7 +493,12 @@ func importFromModules(loaderstate *State, ctx context.Context, path string, rs
 			if !HasModRoot(loaderstate) {
 				queryErr = NewNoMainModulesError(loaderstate)
 			}
-			return module.Version{}, "", "", nil, &ImportMissingError{Path: path, QueryErr: queryErr, isStd: pathIsStd}
+			return module.Version{}, "", "", nil, &ImportMissingError{
+				Path:             path,
+				QueryErr:         queryErr,
+				isStd:            pathIsStd,
+				modContainingCWD: loaderstate.MainModules.ModContainingCWD(),
+			}
 		}
 
 		// So far we've checked the root dependencies.
@@ -558,7 +570,11 @@ func queryImport(loaderstate *State, ctx context.Context, path string, rs *Requi
 			return m, err
 		} else if ok {
 			if cfg.BuildMod == "readonly" {
-				return module.Version{}, &ImportMissingError{Path: path, replaced: m}
+				return module.Version{}, &ImportMissingError{
+					Path:             path,
+					replaced:         m,
+					modContainingCWD: loaderstate.MainModules.ModContainingCWD(),
+				}
 			}
 			return m, nil
 		}
@@ -584,7 +600,11 @@ func queryImport(loaderstate *State, ctx context.Context, path string, rs *Requi
 		// QueryPattern cannot possibly find a module containing this package.
 		//
 		// Instead of trying QueryPattern, report an ImportMissingError immediately.
-		return module.Version{}, &ImportMissingError{Path: path, isStd: true}
+		return module.Version{}, &ImportMissingError{
+			Path:             path,
+			isStd:            true,
+			modContainingCWD: loaderstate.MainModules.ModContainingCWD(),
+		}
 	}
 
 	if (cfg.BuildMod == "readonly" || cfg.BuildMod == "vendor") && !allowMissingModuleImports {
@@ -599,7 +619,11 @@ func queryImport(loaderstate *State, ctx context.Context, path string, rs *Requi
 		} else if cfg.BuildModReason != "" {
 			queryErr = fmt.Errorf("import lookup disabled by -mod=%s\n\t(%s)", cfg.BuildMod, cfg.BuildModReason)
 		}
-		return module.Version{}, &ImportMissingError{Path: path, QueryErr: queryErr}
+		return module.Version{}, &ImportMissingError{
+			Path:             path,
+			QueryErr:         queryErr,
+			modContainingCWD: loaderstate.MainModules.ModContainingCWD(),
+		}
 	}
 
 	// Look up module containing the package, for addition to the build list.
@@ -617,7 +641,11 @@ func queryImport(loaderstate *State, ctx context.Context, path string, rs *Requi
 		if errors.Is(err, fs.ErrNotExist) {
 			// Return "cannot find module providing package […]" instead of whatever
 			// low-level error QueryPattern produced.
-			return module.Version{}, &ImportMissingError{Path: path, QueryErr: err}
+			return module.Version{}, &ImportMissingError{
+				Path:             path,
+				QueryErr:         err,
+				modContainingCWD: loaderstate.MainModules.ModContainingCWD(),
+			}
 		} else {
 			return module.Version{}, err
 		}
@@ -645,6 +673,7 @@ func queryImport(loaderstate *State, ctx context.Context, path string, rs *Requi
 		Path:              path,
 		Module:            candidates[0].Mod,
 		newMissingVersion: candidate0MissingVersion,
+		modContainingCWD:  loaderstate.MainModules.ModContainingCWD(),
 	}
 }
 

src/cmd/go/internal/modload/load.go

@@ -1588,6 +1588,7 @@ func (ld *loader) resolveMissingImports(loaderstate *State, ctx context.Context)
 					for curstack := pkg.stack; curstack != nil; curstack = curstack.stack {
 						if loaderstate.MainModules.Contains(curstack.mod.Path) {
 							ime.ImportingMainModule = curstack.mod
+							ime.modRoot = loaderstate.MainModules.ModRoot(ime.ImportingMainModule)
 							break
 						}
 					}