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

ssa: fix abiType && abiMethoOf

Browse Source
This commit is contained in:
visualfc
2024-06-23 06:51:09 +08:00
parent 5238c2457d
commit 16352df5b1
17 changed files with 3064 additions and 4409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ssa/abitype.go
View File

@@ -118,12 +118,11 @@ func (b Builder) abiMethods(t *types.Named) (ret, pret int) {
}
// Method{name string, typ *FuncType, ifn, tfn abi.Text}
func (b Builder) abiMethodOf(m types.Object, mSig *types.Signature /*, bg Background = InGo */) (mthd, ptrMthd Expr) {
func (b Builder) abiMethodOf(mPkg *types.Package, mName string, mSig *types.Signature /*, bg Background = InGo */) (mthd, ptrMthd Expr) {
prog := b.Prog
mPkg, mName := m.Pkg(), m.Name()
name := b.Str(mName).impl
if !token.IsExported(mName) {
name = b.Str(abi.FullName(mPkg, m.Name())).impl
name = b.Str(abi.FullName(mPkg, mName)).impl
}
abiSigGo := types.NewSignatureType(nil, nil, nil, mSig.Params(), mSig.Results(), mSig.Variadic())
abiSig := prog.FuncDecl(abiSigGo, InGo).raw.Type
@@ -215,12 +214,19 @@ func (b Builder) abiInitNamed(ret Expr, t *types.Named) func() Expr {
var mthds []Expr
var ptrMthds = make([]Expr, 0, n)
for i := 0; i < n; i++ {
var mPkg *types.Package
var mSig *types.Signature
m := mset[i]
sig := m.Obj().(*types.Func).Type().(*types.Signature)
if _, ok := sig.Recv().Type().Underlying().(*types.Interface); ok {
sig = m.Type().(*types.Signature)
obj := m.Obj()
mName := obj.Name()
if token.IsExported(mName) {
mPkg = t.Obj().Pkg()
mSig = m.Type().(*types.Signature)
} else {
mPkg = obj.Pkg()
mSig = obj.Type().(*types.Signature)
}
mthd, ptrMthd := b.abiMethodOf(m.Obj(), sig)
mthd, ptrMthd := b.abiMethodOf(mPkg, mName, mSig)
if !mthd.IsNil() {
mthds = append(mthds, mthd)
}
@@ -238,24 +244,24 @@ func (b Builder) abiInitNamed(ret Expr, t *types.Named) func() Expr {
}
func (b Builder) abiPointerOf(t *types.Pointer) func() Expr {
elem := b.abiType(t.Elem())
elem := b.abiTypeOf(t.Elem())
return func() Expr {
return b.Call(b.Pkg.rtFunc("PointerTo"), elem)
return b.Call(b.Pkg.rtFunc("PointerTo"), elem())
}
}
func (b Builder) abiSliceOf(t *types.Slice) func() Expr {
elem := b.abiType(t.Elem())
elem := b.abiTypeOf(t.Elem())
return func() Expr {
return b.Call(b.Pkg.rtFunc("SliceOf"), elem)
return b.Call(b.Pkg.rtFunc("SliceOf"), elem())
}
}
func (b Builder) abiArrayOf(t *types.Array) func() Expr {
elem := b.abiType(t.Elem())
elem := b.abiTypeOf(t.Elem())
return func() Expr {
n := b.Prog.IntVal(uint64(t.Len()), b.Prog.Uintptr())
return b.Call(b.Pkg.rtFunc("ArrayOf"), n, elem)
return b.Call(b.Pkg.rtFunc("ArrayOf"), n, elem())
}
}
@@ -312,12 +318,17 @@ func (p Package) abiTypeInit(g Global, t types.Type, pub bool) {
}
vexpr := tabi()
prog := p.Prog
kind, _, _ := abi.DataKindOf(t, 0, prog.is32Bits)
if kind == abi.Integer || kind == abi.BitCast {
kind, _, lvl := abi.DataKindOf(t, 0, prog.is32Bits)
switch kind {
case abi.Integer, abi.BitCast:
// abi.Type.Kind_ |= abi.KindDirectIface
const kindDirectIface = 1 << 5
pkind := b.FieldAddr(vexpr, 6)
b.Store(pkind, b.BinOp(token.OR, b.Load(pkind), Expr{prog.IntVal(kindDirectIface, prog.Byte()).impl, prog.Byte()}))
case abi.Pointer:
if lvl > 0 {
b.InlineCall(b.Pkg.rtFunc("SetDirectIface"), vexpr)
}
}
b.Store(expr, vexpr)
if pub {

6
ssa/interface.go
View File

@@ -126,16 +126,10 @@ func (b Builder) MakeInterface(tinter Type, x Expr) (ret Expr) {
default:
panic("todo")
}
// abi.Type.Kind_ |= abi.KindDirectIface
pkind := b.FieldAddr(tabi, 6)
b.Store(pkind, b.BinOp(token.OR, b.Load(pkind), Expr{prog.IntVal(kindDirectIface, prog.Byte()).impl, prog.Byte()}))
data := llvm.CreateIntToPtr(b.impl, u, prog.tyVoidPtr())
return Expr{b.unsafeInterface(rawIntf, tabi, data), tinter}
}
// abi.KindDirectIface
const kindDirectIface = 1 << 5
func (b Builder) valFromData(typ Type, data llvm.Value) Expr {
prog := b.Prog
kind, real, lvl := abi.DataKindOf(typ.raw.Type, 0, prog.is32Bits)