From: Matthew Dempsky <mdempsky@google.com>
Date: Tue, 21 Jul 2015 00:04:18 +0000 (-0700)
Subject: go/internal/gccgoimporter: fix handling of "byte" and "rune" alias types
X-Git-Tag: go1.5beta3~141
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=af8297da86a19d68ee442db8ec325be952e72ae2;p=gostls13.git

go/internal/gccgoimporter: fix handling of "byte" and "rune" alias types

Fixes #11762.

Change-Id: I0c7797a2dfdbbcf137bb287f854037a4a697c6e4
Reviewed-on: https://go-review.googlesource.com/12443
Reviewed-by: Robert Griesemer <gri@golang.org>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
---

diff --git a/src/go/internal/gccgoimporter/parser.go b/src/go/internal/gccgoimporter/parser.go
index e985de5a67..c06cce435b 100644
--- a/src/go/internal/gccgoimporter/parser.go
+++ b/src/go/internal/gccgoimporter/parser.go
@@ -658,8 +658,8 @@ func lookupBuiltinType(typ int) types.Type {
 		gccgoBuiltinCOMPLEX64:  types.Typ[types.Complex64],
 		gccgoBuiltinCOMPLEX128: types.Typ[types.Complex128],
 		gccgoBuiltinERROR:      types.Universe.Lookup("error").Type(),
-		gccgoBuiltinBYTE:       types.Typ[types.Byte],
-		gccgoBuiltinRUNE:       types.Typ[types.Rune],
+		gccgoBuiltinBYTE:       types.Universe.Lookup("byte").Type(),
+		gccgoBuiltinRUNE:       types.Universe.Lookup("rune").Type(),
 	}[typ]
 }