diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-01-22 15:43:40 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-01-22 15:43:40 +0000 |
| commit | 494df8753b8c0a4dd02e7208e0bae20bee6ec1d5 (patch) | |
| tree | 1cb7f772ce52d0061ee020d8c7b76b324f50bcce /libgo | |
| parent | 12f154688d9e942614d49178dee92b766afb64bb (diff) | |
| download | gcc-494df8753b8c0a4dd02e7208e0bae20bee6ec1d5.zip gcc-494df8753b8c0a4dd02e7208e0bae20bee6ec1d5.tar.gz gcc-494df8753b8c0a4dd02e7208e0bae20bee6ec1d5.tar.bz2 | |
golang.org/x/tools/go/analysis: pass "gccgo" to types.SizesFor
For the gofrontend copy, change calls to types.SizesFor to pass
"gccgo" rather than "gc". Leave the asmdecl pass unchanged since that
pass is gc-specific anyhow.
This has been fixed in a better way in the external repo by
https://golang.org/cl/158317 and friends, but that is not in 1.12, so
use this approach for now.
Reviewed-on: https://go-review.googlesource.com/c/158842
From-SVN: r268153
Diffstat (limited to 'libgo')
4 files changed, 4 insertions, 4 deletions
diff --git a/libgo/go/golang.org/x/tools/go/analysis/passes/cgocall/cgocall.go b/libgo/go/golang.org/x/tools/go/analysis/passes/cgocall/cgocall.go index f2e8949..a6e76a1 100644 --- a/libgo/go/golang.org/x/tools/go/analysis/passes/cgocall/cgocall.go +++ b/libgo/go/golang.org/x/tools/go/analysis/passes/cgocall/cgocall.go @@ -271,7 +271,7 @@ func typeCheckCgoSourceFiles(fset *token.FileSet, pkg *types.Package, files []*a return importMap[path], nil }), // TODO(adonovan): Sizes should probably be provided by analysis.Pass. - Sizes: types.SizesFor("gc", build.Default.GOARCH), + Sizes: types.SizesFor("gccgo", build.Default.GOARCH), Error: func(error) {}, // ignore errors (e.g. unused import) } diff --git a/libgo/go/golang.org/x/tools/go/analysis/passes/printf/types.go b/libgo/go/golang.org/x/tools/go/analysis/passes/printf/types.go index e881046..87523a1 100644 --- a/libgo/go/golang.org/x/tools/go/analysis/passes/printf/types.go +++ b/libgo/go/golang.org/x/tools/go/analysis/passes/printf/types.go @@ -236,4 +236,4 @@ func matchStructArgType(pass *analysis.Pass, t printfArgType, typ *types.Struct, return true } -var archSizes = types.SizesFor("gc", build.Default.GOARCH) +var archSizes = types.SizesFor("gccgo", build.Default.GOARCH) diff --git a/libgo/go/golang.org/x/tools/go/analysis/passes/shift/shift.go b/libgo/go/golang.org/x/tools/go/analysis/passes/shift/shift.go index 56b150b..4142ac3 100644 --- a/libgo/go/golang.org/x/tools/go/analysis/passes/shift/shift.go +++ b/libgo/go/golang.org/x/tools/go/analysis/passes/shift/shift.go @@ -125,4 +125,4 @@ var ( uintptrBitSize = 8 * archSizes.Sizeof(types.Typ[types.Uintptr]) ) -var archSizes = types.SizesFor("gc", build.Default.GOARCH) +var archSizes = types.SizesFor("gccgo", build.Default.GOARCH) diff --git a/libgo/go/golang.org/x/tools/go/analysis/unitchecker/unitchecker.go b/libgo/go/golang.org/x/tools/go/analysis/unitchecker/unitchecker.go index 76dabc2..5943c99 100644 --- a/libgo/go/golang.org/x/tools/go/analysis/unitchecker/unitchecker.go +++ b/libgo/go/golang.org/x/tools/go/analysis/unitchecker/unitchecker.go @@ -221,7 +221,7 @@ func run(fset *token.FileSet, cfg *Config, analyzers []*analysis.Analyzer) ([]re }) tc := &types.Config{ Importer: importer, - Sizes: types.SizesFor("gc", build.Default.GOARCH), // assume gccgo ≡ gc? + Sizes: types.SizesFor("gccgo", build.Default.GOARCH), // assume gccgo ≡ gc? } info := &types.Info{ Types: make(map[ast.Expr]types.TypeAndValue), |