cmd/go/internal/modload: ensure that modRoot and targetPrefix are initialized in...

For #37438

Change-Id: I2e1f47d567842ac5504b7b8ed0b3fba6f92d778b
Reviewed-on: https://go-review.googlesource.com/c/go/+/266340
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Reviewed-by: Michael Matloob <matloob@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Bryan C. Mills <bcmills@google.com>

diff --git a/src/cmd/go/internal/modload/load.go b/src/cmd/go/internal/modload/load.go
index f9c468c8b2c32e291d71eeadf4555d970abf2c55..0a84a1765a584ef51c62027b6eca9f2a869c1b7d 100644 (file)
--- a/src/cmd/go/internal/modload/load.go
+++ b/src/cmd/go/internal/modload/load.go
@@ -520,9 +520,10 @@ func ImportFromFiles(ctx context.Context, gofiles []string) {
 // DirImportPath returns the effective import path for dir,
 // provided it is within the main module, or else returns ".".
 func DirImportPath(dir string) string {
-       if modRoot == "" {
+       if !HasModRoot() {
                return "."
        }
+       LoadModFile(context.TODO())
 
        if !filepath.IsAbs(dir) {
                dir = filepath.Join(base.Cwd, dir)