cmd/go: properly call PackageModuleRoot to get modroot for index

PackageModuleRoot needs to be called with the package's path, not
its directory on disk.

Change-Id: I080fe8ce2aeb72e1466624db81595a00915606bb
Reviewed-on: https://go-review.googlesource.com/c/go/+/410820
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Michael Matloob <matloob@golang.org>

diff --git a/src/cmd/go/internal/load/pkg.go b/src/cmd/go/internal/load/pkg.go
index 4c7833b4d2a6442610739d6c54b2b6e2cf20780f..394a4a438399b112e5b7812c7c48cb169c7bcbf4 100644 (file)
--- a/src/cmd/go/internal/load/pkg.go
+++ b/src/cmd/go/internal/load/pkg.go
@@ -871,7 +871,7 @@ func loadPackageData(ctx context.Context, path, parentPath, parentDir, parentRoo
                        if !cfg.ModulesEnabled {
                                buildMode = build.ImportComment
                        }
-                       if modroot := modload.PackageModRoot(ctx, r.dir); modroot != "" {
+                       if modroot := modload.PackageModRoot(ctx, r.path); modroot != "" {
                                if mi, err := modindex.Get(modroot); err == nil {
                                        data.p, data.err = mi.Import(cfg.BuildContext, mi.RelPath(r.dir), buildMode)
                                        goto Happy