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

cl: initFnNameOfHasPatch fix (should rename before funcOf)

Browse Source
This commit is contained in:
xushiwei
2024-06-18 18:44:07 +08:00
parent 43c55b36c8
commit a6b83d77bd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cl/compile.go
View File

@@ -190,14 +190,18 @@ func (p *context) compileFuncDecl(pkg llssa.Package, f *ssa.Function) (llssa.Fun
*/ */
return nil, nil, ignoredFunc return nil, nil, ignoredFunc
} }
sig := f.Signature
state := p.state
isInit := (f.Name() == "init" && sig.Recv() == nil)
if isInit && state == pkgHasPatch {
name = initFnNameOfHasPatch(name)
}
fn := pkg.FuncOf(name) fn := pkg.FuncOf(name)
if fn != nil && fn.HasBody() { if fn != nil && fn.HasBody() {
return fn, nil, goFunc return fn, nil, goFunc
} }
var isInit bool
var state = p.state
var sig = f.Signature
var hasCtx = len(f.FreeVars) > 0 var hasCtx = len(f.FreeVars) > 0
if hasCtx { if hasCtx {
if debugInstr { if debugInstr {
@@ -209,7 +213,6 @@ func (p *context) compileFuncDecl(pkg llssa.Package, f *ssa.Function) (llssa.Fun
if debugInstr { if debugInstr {
log.Println("==> NewFunc", name, "type:", sig.Recv(), sig, "ftype:", ftype) log.Println("==> NewFunc", name, "type:", sig.Recv(), sig, "ftype:", ftype)
} }
isInit = (f.Name() == "init" && sig.Recv() == nil)
} }
if fn == nil { if fn == nil {
if name == "main" { if name == "main" {
@@ -219,8 +222,6 @@ func (p *context) compileFuncDecl(pkg llssa.Package, f *ssa.Function) (llssa.Fun
ret := types.NewParam(token.NoPos, pkgTypes, "", p.prog.CInt().RawType()) ret := types.NewParam(token.NoPos, pkgTypes, "", p.prog.CInt().RawType())
results := types.NewTuple(ret) results := types.NewTuple(ret)
sig = types.NewSignatureType(nil, nil, nil, params, results, false) sig = types.NewSignatureType(nil, nil, nil, params, results, false)
} else if isInit && state == pkgHasPatch {
name = initFnNameOfHasPatch(name)
} }
fn = pkg.NewFuncEx(name, sig, llssa.Background(ftype), hasCtx) fn = pkg.NewFuncEx(name, sig, llssa.Background(ftype), hasCtx)
} }