close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <gri@golang.org>
This commit is contained in:
Robert Griesemer 2016-02-25 17:10:38 -08:00
parent 2327a65811
commit 06f9f0dd88
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go/gcimporter15/bimport.go
View File

@ -682,4 +682,8 @@ var predeclared = []types.Type{
// package unsafe // package unsafe
types.Typ[types.UnsafePointer], types.Typ[types.UnsafePointer],
// any type, for builtin export data
// TODO(mdempsky): Provide an actual Type value to represent "any"?
types.Typ[types.Invalid],
} }

2
go/gcimporter15/gcimporter.go
View File

@ -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 // For qualified names, the returned package is nil (and not created if
// it doesn't exist yet) unless materializePkg is set (which creates an // it doesn't exist yet) unless materializePkg is set (which creates an
// unnamed package with valid package path). In the latter case, a // 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) { func (p *parser) parseName(parent *types.Package, materializePkg bool) (pkg *types.Package, name string) {
pkg = parent pkg = parent