developgo
diff --git a/‎compiler/compiler.go
Lines changed: 2 additions & 2 deletions b/‎compiler/compiler.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎compiler/package.go
Lines changed: 7 additions & 4 deletions b/‎compiler/package.go
Lines changed: 7 additions & 4 deletions
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/gopherjs/gopherjs/compiler/prelude"
-	"golang.org/x/tools/go/gcimporter15"
+	"golang.org/x/tools/go/gcexportdata"
 )
 
 var sizes32 = &types.StdSizes{WordSize: 4, MaxAlign: 8}
@@ -243,7 +243,7 @@ func ReadArchive(filename, path string, r io.Reader, packages map[string]*types.
 	}
 
 	var err error
-	_, packages[path], err = gcimporter.BImportData(token.NewFileSet(), packages, a.ExportData, path)
+	packages[path], err = gcexportdata.Read(bytes.NewReader(a.ExportData), token.NewFileSet(), packages, path)
 	if err != nil {
 		return nil, err
 	}
 
@@ -13,7 +13,7 @@ import (
 
 	"github.com/gopherjs/gopherjs/compiler/analysis"
 	"github.com/neelance/astrewrite"
-	"golang.org/x/tools/go/gcimporter15"
+	"golang.org/x/tools/go/gcexportdata"
 	"golang.org/x/tools/go/types/typeutil"
 )
 
@@ -164,8 +164,11 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 	}
 	importContext.Packages[importPath] = typesPkg
 
-	exportData := gcimporter.BExportData(nil, typesPkg)
-	encodedFileSet := bytes.NewBuffer(nil)
+	exportData := new(bytes.Buffer)
+	if err := gcexportdata.Write(exportData, nil, typesPkg); err != nil {
+		return nil, fmt.Errorf("failed to write export data: %v", err)
+	}
+	encodedFileSet := new(bytes.Buffer)
 	if err := fileSet.Write(json.NewEncoder(encodedFileSet).Encode); err != nil {
 		return nil, err
 	}
@@ -541,7 +544,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 		ImportPath:   importPath,
 		Name:         typesPkg.Name(),
 		Imports:      importedPaths,
-		ExportData:   exportData,
+		ExportData:   exportData.Bytes(),
 		Declarations: allDecls,
 		FileSet:      encodedFileSet.Bytes(),
 		Minified:     minify,
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"strings"`
`13`	`13`
`14`	`14`	`"github.com/gopherjs/gopherjs/compiler/prelude"`
`15`		`- "golang.org/x/tools/go/gcimporter15"`
	`15`	`+ "golang.org/x/tools/go/gcexportdata"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var sizes32 = &types.StdSizes{WordSize: 4, MaxAlign: 8}`
`@@ -243,7 +243,7 @@ func ReadArchive(filename, path string, r io.Reader, packages map[string]*types.`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`var err error`
`246`		`- _, packages[path], err = gcimporter.BImportData(token.NewFileSet(), packages, a.ExportData, path)`
	`246`	`+ packages[path], err = gcexportdata.Read(bytes.NewReader(a.ExportData), token.NewFileSet(), packages, path)`
`247`	`247`	`if err != nil {`
`248`	`248`	`return nil, err`
`249`	`249`	`}`