gopherjs
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: 2 additions & 2 deletions b/‎compiler/package.go
Lines changed: 2 additions & 2 deletions
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/gopherjs/gopherjs/compiler/prelude"
-	"github.com/gopherjs/gopherjs/third_party/importer"
+	"golang.org/x/tools/go/gcimporter15"
 )
 
 var sizes32 = &types.StdSizes{WordSize: 4, MaxAlign: 8}
@@ -239,7 +239,7 @@ func ReadArchive(filename, path string, r io.Reader, packages map[string]*types.
 	}
 
 	var err error
-	_, packages[path], err = importer.ImportData(packages, a.ExportData)
+	_, packages[path], err = gcimporter.BImportData(token.NewFileSet(), packages, a.ExportData, path)
 	if err != nil {
 		return nil, err
 	}
 
@@ -12,8 +12,8 @@ import (
 	"strings"
 
 	"github.com/gopherjs/gopherjs/compiler/analysis"
-	"github.com/gopherjs/gopherjs/third_party/importer"
 	"github.com/neelance/astrewrite"
+	"golang.org/x/tools/go/gcimporter15"
 	"golang.org/x/tools/go/types/typeutil"
 )
 
@@ -164,7 +164,7 @@ func Compile(importPath string, files []*ast.File, fileSet *token.FileSet, impor
 	}
 	importContext.Packages[importPath] = typesPkg
 
-	exportData := importer.ExportData(typesPkg)
+	exportData := gcimporter.BExportData(nil, typesPkg)
 	encodedFileSet := bytes.NewBuffer(nil)
 	if err := fileSet.Write(json.NewEncoder(encodedFileSet).Encode); err != nil {
 		return nil, err
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`		`- "github.com/gopherjs/gopherjs/third_party/importer"`
	`15`	`+ "golang.org/x/tools/go/gcimporter15"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var sizes32 = &types.StdSizes{WordSize: 4, MaxAlign: 8}`
`@@ -239,7 +239,7 @@ func ReadArchive(filename, path string, r io.Reader, packages map[string]*types.`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`var err error`
`242`		`- _, packages[path], err = importer.ImportData(packages, a.ExportData)`
	`242`	`+ _, packages[path], err = gcimporter.BImportData(token.NewFileSet(), packages, a.ExportData, path)`
`243`	`243`	`if err != nil {`
`244`	`244`	`return nil, err`
`245`	`245`	`}`