admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refineEx: Deduper

Browse Source
This commit is contained in:
xushiwei
2024-06-15 23:03:29 +08:00
parent 4af872ddd5
commit 1b48b98e22
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/packages/load.go
View File

@@ -130,7 +130,7 @@ type importerFunc func(path string) (*types.Package, error)
func (f importerFunc) Import(path string) (*types.Package, error) { return f(path) } func (f importerFunc) Import(path string) (*types.Package, error) { return f(path) }
func loadPackageEx(ld *loader, lpkg *loaderPackage) { func loadPackageEx(dedup *Deduper, ld *loader, lpkg *loaderPackage) {
if lpkg.PkgPath == "unsafe" { if lpkg.PkgPath == "unsafe" {
// Fill in the blanks to avoid surprises. // Fill in the blanks to avoid surprises.
lpkg.Types = types.Unsafe lpkg.Types = types.Unsafe
@@ -404,7 +404,7 @@ func loadPackageEx(ld *loader, lpkg *loaderPackage) {
lpkg.IllTyped = illTyped lpkg.IllTyped = illTyped
} }
func loadRecursiveEx(ld *loader, lpkg *loaderPackage) { func loadRecursiveEx(dedup *Deduper, ld *loader, lpkg *loaderPackage) {
lpkg.loadOnce.Do(func() { lpkg.loadOnce.Do(func() {
// Load the direct dependencies, in parallel. // Load the direct dependencies, in parallel.
var wg sync.WaitGroup var wg sync.WaitGroup
@@ -412,16 +412,16 @@ func loadRecursiveEx(ld *loader, lpkg *loaderPackage) {
imp := ld.pkgs[ipkg.ID] imp := ld.pkgs[ipkg.ID]
wg.Add(1) wg.Add(1)
go func(imp *loaderPackage) { go func(imp *loaderPackage) {
loadRecursiveEx(ld, imp) loadRecursiveEx(dedup, ld, imp)
wg.Done() wg.Done()
}(imp) }(imp)
} }
wg.Wait() wg.Wait()
loadPackageEx(ld, lpkg) loadPackageEx(dedup, ld, lpkg)
}) })
} }
func refineEx(ld *loader, response *packages.DriverResponse) ([]*Package, error) { func refineEx(dedup *Deduper, ld *loader, response *packages.DriverResponse) ([]*Package, error) {
roots := response.Roots roots := response.Roots
rootMap := make(map[string]int, len(roots)) rootMap := make(map[string]int, len(roots))
for i, root := range roots { for i, root := range roots {
@@ -561,7 +561,7 @@ func refineEx(ld *loader, response *packages.DriverResponse) ([]*Package, error)
for _, lpkg := range initial { for _, lpkg := range initial {
wg.Add(1) wg.Add(1)
go func(lpkg *loaderPackage) { go func(lpkg *loaderPackage) {
loadRecursiveEx(ld, lpkg) loadRecursiveEx(dedup, ld, lpkg)
wg.Done() wg.Done()
}(lpkg) }(lpkg)
} }
@@ -670,7 +670,7 @@ func LoadEx(dedup *Deduper, sizes func(types.Sizes) types.Sizes, cfg *Config, pa
if sizes != nil { if sizes != nil {
ld.sizes = sizes(ld.sizes) ld.sizes = sizes(ld.sizes)
} }
return refineEx(ld, response) return refineEx(dedup, ld, response)
} }
// Visit visits all the packages in the import graph whose roots are // Visit visits all the packages in the import graph whose roots are