From 8f80bd89728ecc0653fc1121be40af829ca6092a Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 4 Dec 2018 14:29:11 +0000
Subject: [PATCH] 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
---
 gcc/go/gofrontend/MERGE   | 2 +-
 libgo/go/cmd/vet/types.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 07381f4..558f713 100644
--- 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 5f8e481..60b6125 100644
--- 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)
-- 
2.7.4