qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-05 17:46:16 -07:00
Code Releases Activity

go/gcexportdata: use IExportData when writing gcexportdata

Browse Source 
Updates golang/go#28260

Change-Id: Id0ef98e1599fbef4dd67ba23c20ddb8bc4d33228
Reviewed-on: https://go-review.googlesource.com/c/tools/+/198742
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
Rebecca Stambler 2019-10-03 17:28:33 -04:00 committed by Brad Fitzpatrick
parent 9901302c21
commit 246a69f4f1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go/gcexportdata/gcexportdata.go
View File

@ -100,7 +100,7 @@ func Read(in io.Reader, fset *token.FileSet, imports map[string]*types.Package,
// Write writes encoded type information for the specified package to out. // Write writes encoded type information for the specified package to out.
// The FileSet provides file position information for named objects. // The FileSet provides file position information for named objects.
func Write(out io.Writer, fset *token.FileSet, pkg *types.Package) error { func Write(out io.Writer, fset *token.FileSet, pkg *types.Package) error {
b, err := gcimporter.BExportData(fset, pkg) b, err := gcimporter.IExportData(fset, pkg)
if err != nil { if err != nil {
return err return err
} }

8
go/internal/gcimporter/iimport.go
View File

@ -143,12 +143,20 @@ func IImportData(fset *token.FileSet, imports map[string]*types.Package, data []
p.pkgIndex[pkg] = nameIndex p.pkgIndex[pkg] = nameIndex
pkgList[i] = pkg pkgList[i] = pkg
} }
if len(pkgList) == 0 {
errorf("no packages found for %s", path)
panic("unreachable")
}
var localpkg *types.Package var localpkg *types.Package
for _, pkg := range pkgList { for _, pkg := range pkgList {
if pkg.Path() == path { if pkg.Path() == path {
localpkg = pkg localpkg = pkg
break
} }
} }
if localpkg == nil {
localpkg = pkgList[0]
}
names := make([]string, 0, len(p.pkgIndex[localpkg])) names := make([]string, 0, len(p.pkgIndex[localpkg]))
for name := range p.pkgIndex[localpkg] { for name := range p.pkgIndex[localpkg] {