From afc6aad76eb1194c038c653531eef344468d2ac4 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 12 Apr 2022 12:46:36 -0700 Subject: [PATCH] go/packages: make loadFromExportData ignore go.shape From Reilly Watson (previous CLA) Fixes golang/go#51629 Change-Id: I5891aa568d66d9471488a957e45a2fa22a58e0a4 Reviewed-on: https://go-review.googlesource.com/c/tools/+/400034 Run-TryBot: Brad Fitzpatrick gopls-CI: kokoro TryBot-Result: Gopher Robot Reviewed-by: Russ Cox Reviewed-by: Ian Lance Taylor --- go/packages/packages.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/go/packages/packages.go b/go/packages/packages.go index f9bc35de5a9..5e09e239f9d 100644 --- a/go/packages/packages.go +++ b/go/packages/packages.go @@ -1234,6 +1234,11 @@ func (ld *loader) loadFromExportData(lpkg *loaderPackage) (*types.Package, error if err != nil { return nil, fmt.Errorf("reading %s: %v", lpkg.ExportFile, err) } + if _, ok := view["go.shape"]; ok { + // Account for the pseudopackage "go.shape" that gets + // created by generic code. + viewLen++ + } if viewLen != len(view) { log.Panicf("golang.org/x/tools/go/packages: unexpected new packages during load of %s", lpkg.PkgPath) }