packages: remove golang.org/x/tools/go/gcexportdata

Author: visualfc

Diff for: .github/workflows/go.yml

@@ -46,10 +46,8 @@ jobs:
       with:
         go-version: ${{ matrix.go-version }}
 
-    - name: Update golang.org/x/tools
-      run: |
-        go work init .
-        go work edit -replace golang.org/x/tools=golang.org/x/[email protected]
+    - name: Set types alias env
+      run: echo "GODEBUG=gotypesalias=1" >> $GITHUB_ENV
 
     - name: Build
       run: go build -v ./...

Diff for: packages/imp.go

@@ -16,15 +16,14 @@ package packages
 import (
 	"bytes"
 	"errors"
+	"go/importer"
 	"go/token"
 	"go/types"
 	"io"
 	"os"
 	"os/exec"
 	"sync"
 	"sync/atomic"
-
-	"golang.org/x/tools/go/gcexportdata"
 )
 
 // ----------------------------------------------------------------------------
@@ -42,6 +41,7 @@ type Importer struct {
 	m      sync.RWMutex
 	cache  Cache
 	tags   string
+	imp    types.Importer
 }
 
 // NewImporter creates an Importer object that meets types.ImporterFrom and types.Importer interface.
@@ -55,7 +55,13 @@ func NewImporter(fset *token.FileSet, workDir ...string) *Importer {
 	}
 	loaded := make(map[string]*types.Package)
 	loaded["unsafe"] = types.Unsafe
-	return &Importer{loaded: loaded, fset: fset, dir: dir}
+	r := &Importer{loaded: loaded, fset: fset, dir: dir}
+	r.imp = importer.ForCompiler(fset, "gc", r.lookup)
+	return r
+}
+
+func (p *Importer) lookup(pkgPath string) (io.ReadCloser, error) {
+	return p.findExport(p.dir, pkgPath)
 }
 
 // SetCache sets an optional cache for the importer.
@@ -97,22 +103,7 @@ func (p *Importer) ImportFrom(pkgPath, dir string, mode types.ImportMode) (*type
 		return ret, nil
 	}
 	p.m.RUnlock()
-	f, err := p.findExport(dir, pkgPath)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	return p.loadByExport(f, pkgPath)
-}
-
-func (p *Importer) loadByExport(f io.ReadCloser, pkgPath string) (ret *types.Package, err error) {
-	r, err := gcexportdata.NewReader(f)
-	if err == nil {
-		p.m.Lock() // use mutex because Import should be multi-thread safe
-		defer p.m.Unlock()
-		ret, err = gcexportdata.Read(r, p.fset, p.loaded, pkgPath)
-	}
-	return
+	return p.imp.Import(pkgPath)
 }
 
 // ----------------------------------------------------------------------------

Diff for: packages/imp_test.go

@@ -14,7 +14,6 @@
 package packages
 
 import (
-	"go/types"
 	"io"
 	"os"
 	"testing"
@@ -50,24 +49,6 @@ func TestImportBuiltin(t *testing.T) {
 	}
 }
 
-func Test_loadByExport(t *testing.T) {
-	p := NewImporter(nil)
-	if _, err := loadByExport(p, "/not-found", "notfound"); !os.IsNotExist(err) {
-		t.Fatal("Test_loadByExport:", err)
-	}
-	if _, err := p.findExport(".", "C"); err == nil {
-		t.Fatal("Test_loadByExport: no error?")
-	}
-}
-
-func loadByExport(p *Importer, expfile, pkgPath string) (pkg *types.Package, err error) {
-	f, err := os.Open(expfile)
-	if err != nil {
-		return
-	}
-	return p.loadByExport(f, pkgPath)
-}
-
 // ----------------------------------------------------------------------------
 
 type diskCache struct {