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

Merge pull request #1002 from cpunion/fix-global-var-type

Browse Source 
cl: fix wrong global variable type patching
This commit is contained in:
xushiwei
2025-02-17 06:09:10 +08:00
committed by GitHub
parent 5e1e7bdad0 d8e782f3f1
commit 69deeca321
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/cl/compile.go
View File

@@ -160,7 +160,7 @@ func (p *context) compileMethods(pkg llssa.Package, typ types.Type) {
// Global variable. // Global variable.
func (p *context) compileGlobal(pkg llssa.Package, gbl *ssa.Global) { func (p *context) compileGlobal(pkg llssa.Package, gbl *ssa.Global) {
typ := globalType(gbl) typ := p.patchType(gbl.Type())
name, vtype, define := p.varName(gbl.Pkg.Pkg, gbl) name, vtype, define := p.varName(gbl.Pkg.Pkg, gbl)
if vtype == pyVar { if vtype == pyVar {
return return
@@ -1102,30 +1102,20 @@ func processPkg(ctx *context, ret llssa.Package, pkg *ssa.Package) {
} }
} }
func globalType(gbl *ssa.Global) types.Type {
t := gbl.Type()
if t, ok := t.(*types.Named); ok {
o := t.Obj()
if pkg := o.Pkg(); typepatch.IsPatched(pkg) {
if patch := gbl.Pkg.Pkg.Scope().Lookup(o.Name()); patch != nil {
return patch.Type()
}
}
}
return t
}
func (p *context) type_(typ types.Type, bg llssa.Background) llssa.Type { func (p *context) type_(typ types.Type, bg llssa.Background) llssa.Type {
return p.prog.Type(p.patchType(typ), bg) return p.prog.Type(p.patchType(typ), bg)
} }
func (p *context) patchType(typ types.Type) types.Type { func (p *context) patchType(typ types.Type) types.Type {
if t, ok := typ.(*types.Named); ok { switch typ := typ.(type) {
o := t.Obj() case *types.Pointer:
return types.NewPointer(p.patchType(typ.Elem()))
case *types.Named:
o := typ.Obj()
if pkg := o.Pkg(); typepatch.IsPatched(pkg) { if pkg := o.Pkg(); typepatch.IsPatched(pkg) {
if patch, ok := p.patches[pkg.Path()]; ok { if patch, ok := p.patches[pkg.Path()]; ok {
if obj := patch.Types.Scope().Lookup(o.Name()); obj != nil { if obj := patch.Types.Scope().Lookup(o.Name()); obj != nil {
return p.prog.Type(instantiate(obj.Type(), t), llssa.InGo).RawType() return p.prog.Type(instantiate(obj.Type(), typ), llssa.InGo).RawType()
} }
} }
} }

2
compiler/cl/import.go
View File

@@ -568,7 +568,7 @@ func (p *context) varOf(b llssa.Builder, v *ssa.Global) llssa.Expr {
} }
ret := pkg.VarOf(name) ret := pkg.VarOf(name)
if ret == nil { if ret == nil {
ret = pkg.NewVar(name, globalType(v), llssa.Background(vtype)) ret = pkg.NewVar(name, p.patchType(v.Type()), llssa.Background(vtype))
} }
return ret.Expr return ret.Expr
} }