From b6b8ce085cecc97f3404d9ad28c707eb5c5856a5 Mon Sep 17 00:00:00 2001 From: Gavin Li Date: Thu, 3 Oct 2024 15:19:03 -0400 Subject: [PATCH 1/2] fix: type sizing when cross-compiling --- pkg/goanalysis/runner_loadingpackage.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/goanalysis/runner_loadingpackage.go b/pkg/goanalysis/runner_loadingpackage.go index 8abe2b6c1c7f..4813527c8786 100644 --- a/pkg/goanalysis/runner_loadingpackage.go +++ b/pkg/goanalysis/runner_loadingpackage.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "go/ast" + "go/build" "go/parser" "go/scanner" "go/types" @@ -164,6 +165,7 @@ func (lp *loadingPackage) loadFromSource(loadMode LoadMode) error { pkg.Errors = append(pkg.Errors, lp.convertError(err)...) }, GoVersion: rv, // TODO(ldez) temporary workaround + Sizes: types.SizesFor("gc", build.Default.GOARCH), } _ = types.NewChecker(tc, pkg.Fset, pkg.Types, pkg.TypesInfo).Files(pkg.Syntax) From c9143db74397a587e79a220c1944b352e58e8150 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Thu, 3 Oct 2024 22:06:47 +0200 Subject: [PATCH 2/2] review: format and default compiler --- pkg/goanalysis/runner_loadingpackage.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/goanalysis/runner_loadingpackage.go b/pkg/goanalysis/runner_loadingpackage.go index 4813527c8786..614cc1c006c0 100644 --- a/pkg/goanalysis/runner_loadingpackage.go +++ b/pkg/goanalysis/runner_loadingpackage.go @@ -165,7 +165,7 @@ func (lp *loadingPackage) loadFromSource(loadMode LoadMode) error { pkg.Errors = append(pkg.Errors, lp.convertError(err)...) }, GoVersion: rv, // TODO(ldez) temporary workaround - Sizes: types.SizesFor("gc", build.Default.GOARCH), + Sizes: types.SizesFor(build.Default.Compiler, build.Default.GOARCH), } _ = types.NewChecker(tc, pkg.Fset, pkg.Types, pkg.TypesInfo).Files(pkg.Syntax)