From 8dab6f11295bfbb4ddd1fca4efa34261bc9ea0fb Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Tue, 3 May 2016 08:58:41 -0700 Subject: [PATCH] go/gcimporter15: adopt changes from golang.org/cl/22714 Fixes x/tools build. Change-Id: Ifd958ff1293ec2c4fd971813ae7b199b5d8244fe Reviewed-on: https://go-review.googlesource.com/22721 Reviewed-by: Alan Donovan --- go/gcimporter15/bexport.go | 7 +++++-- go/gcimporter15/bimport.go | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/go/gcimporter15/bexport.go b/go/gcimporter15/bexport.go index 9cb46f91..1ceae137 100644 --- a/go/gcimporter15/bexport.go +++ b/go/gcimporter15/bexport.go @@ -490,8 +490,11 @@ func (p *exporter) paramList(params *types.Tuple, variadic bool) { } p.typ(t) if n > 0 { - p.string(q.Name()) - p.pkg(q.Pkg(), false) + name := q.Name() + p.string(name) + if name != "_" { + p.pkg(q.Pkg(), false) + } } p.string("") // no compiler-specific info } diff --git a/go/gcimporter15/bimport.go b/go/gcimporter15/bimport.go index 22a6f605..a742dbfd 100644 --- a/go/gcimporter15/bimport.go +++ b/go/gcimporter15/bimport.go @@ -510,10 +510,12 @@ func (p *importer) param(named bool) (*types.Var, bool) { if name == "" { panic("expected named parameter") } + if name != "_" { + pkg = p.pkg() + } if i := strings.Index(name, "ยท"); i > 0 { name = name[:i] // cut off gc-specific parameter numbering } - pkg = p.pkg() } // read and discard compiler-specific info