cmd/vet: use default compiler when determining type sizes

    Fixes a segfault running vet on alpha.

    Patch by Uros Bizjak.

    Reviewed-on: https://go-review.googlesource.com/c/152437

From-SVN: r266781

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 07381f423b21b16f01cc9078975812939cba3f89..558f713fbb5d0688df7beaf0afd356242dab0fd9 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9e016dfe198152f870005ac844fe22c02e5349e3
+7259d9a403db2784c7d03239c6a50e730062fc61
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/go/cmd/vet/types.go b/libgo/go/cmd/vet/types.go
index 5f8e481e01b68115f603557e3cfc4bd82ed567a5..60b61250b85946d4368bd53c0cbce01633d10bed 100644 (file)
--- a/libgo/go/cmd/vet/types.go
+++ b/libgo/go/cmd/vet/types.go
@@ -310,4 +310,4 @@ func (f *File) matchStructArgType(t printfArgType, typ *types.Struct, arg ast.Ex
        return true
 }
 
-var archSizes = types.SizesFor("gc", build.Default.GOARCH)
+var archSizes = types.SizesFor(build.Default.Compiler, build.Default.GOARCH)