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

buildAllPkgs fix

Browse Source
This commit is contained in:
xushiwei
2024-06-16 22:47:57 +08:00
parent dc1fbbf796
commit 9c8570b37d
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
internal/build/build.go
View File

@@ -156,7 +156,8 @@ func Do(args []string, conf *Config) {
return nil return nil
} }
pkgs := buildAllPkgs(prog, imp, initial, nil, mode, verbose) progSSA := ssa.NewProgram(initial[0].Fset, ssaBuildMode)
pkgs := buildAllPkgs(prog, progSSA, imp, initial, nil, mode, verbose)
var runtimeFiles []string var runtimeFiles []string
if needRt { if needRt {
@@ -168,7 +169,7 @@ func Do(args []string, conf *Config) {
for _, v := range pkgs { for _, v := range pkgs {
skip[v.PkgPath] = true skip[v.PkgPath] = true
} }
dpkg := buildAllPkgs(prog, imp, rt[:1], skip, mode, verbose) dpkg := buildAllPkgs(prog, progSSA, imp, rt[:1], skip, mode, verbose)
for _, pkg := range dpkg { for _, pkg := range dpkg {
if !strings.HasSuffix(pkg.ExportFile, ".ll") { if !strings.HasSuffix(pkg.ExportFile, ".ll") {
continue continue
@@ -211,10 +212,9 @@ const (
ssaBuildMode = ssa.SanityCheckFunctions ssaBuildMode = ssa.SanityCheckFunctions
) )
func buildAllPkgs(prog llssa.Program, imp importer, initial []*packages.Package, skip map[string]bool, mode Mode, verbose bool) (pkgs []*aPackage) { func buildAllPkgs(prog llssa.Program, progSSA *ssa.Program, imp importer, initial []*packages.Package, skip map[string]bool, mode Mode, verbose bool) (pkgs []*aPackage) {
// Create SSA-form program representation. // Create SSA-form program representation.
ssaProg, pkgs, errPkgs := allPkgs(imp, initial, ssaBuildMode, verbose) pkgs, errPkgs := allPkgs(progSSA, imp, initial, verbose)
ssaProg.Build()
for _, errPkg := range errPkgs { for _, errPkg := range errPkgs {
for _, err := range errPkg.Errors { for _, err := range errPkg.Errors {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
@@ -424,18 +424,12 @@ var hasAltPkg = map[string]none{
type importer = func(pkgPath string) *packages.Package type importer = func(pkgPath string) *packages.Package
func allPkgs(imp importer, initial []*packages.Package, mode ssa.BuilderMode, verbose bool) (prog *ssa.Program, all []*aPackage, errs []*packages.Package) { func allPkgs(prog *ssa.Program, imp importer, initial []*packages.Package, verbose bool) (all []*aPackage, errs []*packages.Package) {
var fset *token.FileSet
if len(initial) > 0 {
fset = initial[0].Fset
}
prog = ssa.NewProgram(fset, mode)
packages.Visit(initial, nil, func(p *packages.Package) { packages.Visit(initial, nil, func(p *packages.Package) {
if p.Types != nil && !p.IllTyped { if p.Types != nil && !p.IllTyped {
var altPkg *packages.Package var altPkg *packages.Package
var altSSA *ssa.Package var altSSA *ssa.Package
var ssaPkg = prog.CreatePackage(p.Types, p.Syntax, p.TypesInfo, true) var ssaPkg = createSSAPkg(prog, p)
if imp != nil { if imp != nil {
if _, ok := hasAltPkg[p.PkgPath]; ok { if _, ok := hasAltPkg[p.PkgPath]; ok {
if verbose { if verbose {
@@ -443,7 +437,7 @@ func allPkgs(imp importer, initial []*packages.Package, mode ssa.BuilderMode, ve
} }
altPkgPath := "github.com/goplus/llgo/internal/lib/" + p.PkgPath altPkgPath := "github.com/goplus/llgo/internal/lib/" + p.PkgPath
if altPkg = imp(altPkgPath); altPkg != nil { // TODO(xsw): how to minimize import times if altPkg = imp(altPkgPath); altPkg != nil { // TODO(xsw): how to minimize import times
altSSA = createAltSSAPkg(prog, altPkg, verbose) altSSA = createAltSSAPkg(prog, altPkg)
} }
} }
} }
@@ -455,26 +449,28 @@ func allPkgs(imp importer, initial []*packages.Package, mode ssa.BuilderMode, ve
return return
} }
func createAltSSAPkg(prog *ssa.Program, alt *packages.Package, verbose bool) *ssa.Package { func createAltSSAPkg(prog *ssa.Program, alt *packages.Package) *ssa.Package {
altPath := alt.Types.Path() altSSA := prog.ImportedPackage(alt.PkgPath)
altSSA := prog.ImportedPackage(altPath)
if altSSA == nil { if altSSA == nil {
packages.Visit([]*packages.Package{alt}, nil, func(p *packages.Package) { packages.Visit([]*packages.Package{alt}, nil, func(p *packages.Package) {
pkgTypes := p.Types if p.Types != nil && !p.IllTyped {
if pkgTypes != nil && !p.IllTyped { createSSAPkg(prog, p)
if pkgPath := pkgTypes.Path(); prog.ImportedPackage(pkgPath) == nil {
if verbose {
log.Println("==> SSAPackage", pkgPath)
}
prog.CreatePackage(pkgTypes, p.Syntax, p.TypesInfo, true)
}
} }
}) })
altSSA = prog.ImportedPackage(altPath) altSSA = prog.ImportedPackage(alt.PkgPath)
} }
return altSSA return altSSA
} }
func createSSAPkg(prog *ssa.Program, p *packages.Package) *ssa.Package {
pkgSSA := prog.ImportedPackage(p.PkgPath)
if pkgSSA == nil {
pkgSSA = prog.CreatePackage(p.Types, p.Syntax, p.TypesInfo, true)
pkgSSA.Build() // TODO(xsw): build concurrently
}
return pkgSSA
}
var ( var (
// TODO(xsw): complete build flags // TODO(xsw): complete build flags
buildFlags = map[string]bool{ buildFlags = map[string]bool{