From 06f9f0dd883db127702c988d7e352d3ada0685be Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Thu, 25 Feb 2016 17:10:38 -0800 Subject: [PATCH] go/gcimporter15: backport latest changes to binary export format (fix build) This is the gcimporter/bimport.go part of: https://go-review.googlesource.com/19627 Also, fixed a type that was fixed in gcimporter/bimport.go before. TBR=adonovan Change-Id: I0be8549f6ea8c199842623284091499abf698322 Reviewed-on: https://go-review.googlesource.com/19926 Reviewed-by: Robert Griesemer --- go/gcimporter15/bimport.go | 4 ++++ go/gcimporter15/gcimporter.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/go/gcimporter15/bimport.go b/go/gcimporter15/bimport.go index 525e12b8..08355a3b 100644 --- a/go/gcimporter15/bimport.go +++ b/go/gcimporter15/bimport.go @@ -682,4 +682,8 @@ var predeclared = []types.Type{ // package unsafe types.Typ[types.UnsafePointer], + + // any type, for builtin export data + // TODO(mdempsky): Provide an actual Type value to represent "any"? + types.Typ[types.Invalid], } diff --git a/go/gcimporter15/gcimporter.go b/go/gcimporter15/gcimporter.go index 123d5d6f..e1022103 100644 --- a/go/gcimporter15/gcimporter.go +++ b/go/gcimporter15/gcimporter.go @@ -462,7 +462,7 @@ func (p *parser) parseMapType(parent *types.Package) types.Type { // For qualified names, the returned package is nil (and not created if // it doesn't exist yet) unless materializePkg is set (which creates an // unnamed package with valid package path). In the latter case, a -// subequent import clause is expected to provide a name for the package. +// subsequent import clause is expected to provide a name for the package. // func (p *parser) parseName(parent *types.Package, materializePkg bool) (pkg *types.Package, name string) { pkg = parent