From 14d5b80f954f510ba9bcd241821b6f4828498e1a Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Mon, 9 Apr 2018 16:27:07 -0700 Subject: [PATCH] go/gcimporter15: support bimport format v6 Format change introduced by golang.org/cl/105038. Change-Id: I76eefe9ce7f52743cb5cdcfe77e5ee0b5eb8743f Reviewed-on: https://go-review.googlesource.com/105976 Run-TryBot: Matthew Dempsky TryBot-Result: Gobot Gobot Reviewed-by: Robert Griesemer Reviewed-by: Brad Fitzpatrick --- go/gcimporter15/bimport.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/go/gcimporter15/bimport.go b/go/gcimporter15/bimport.go index 1936a7f6..6709e436 100644 --- a/go/gcimporter15/bimport.go +++ b/go/gcimporter15/bimport.go @@ -104,10 +104,10 @@ func BImportData(fset *token.FileSet, imports map[string]*types.Package, data [] // read version specific flags - extend as necessary switch p.version { - // case 6: + // case 7: // ... // fallthrough - case 5, 4, 3, 2, 1: + case 6, 5, 4, 3, 2, 1: p.debugFormat = p.rawStringln(p.rawByte()) == "debug" p.trackAllTypes = p.int() != 0 p.posInfoFormat = p.int() != 0 @@ -184,6 +184,9 @@ func (p *importer) pkg() *types.Package { } else { path = p.string() } + if p.version >= 6 { + p.int() // package height; unused by go/types + } // we should never see an empty package name if name == "" {