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

internal/lib/reflect: closure keep orgtype

Browse Source
This commit is contained in:
visualfc
2024-11-04 09:56:24 +08:00
parent f9eb313f7c
commit 85a736d49b
2 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
internal/lib/reflect/value.go
View File

@@ -183,9 +183,6 @@ func unpackEface(i any) Value {
}
if t.TFlag&abi.TFlagClosure != 0 {
f = (f & flag(^Struct)) | flag(Func) | flagClosure
ft := *t.StructType().Fields[0].Typ.FuncType()
ft.In = ft.In[1:]
t = &ft.Type
}
return Value{t, e.word, f}
}
@@ -1528,7 +1525,7 @@ func (v Value) TrySend(x Value) bool {
// Type returns v's type.
func (v Value) Type() Type {
if v.flag != 0 && v.flag&flagMethod == 0 {
if v.flag != 0 && v.flag&flagMethod == 0 && v.flag&flagClosure == 0 {
return (*rtype)(unsafe.Pointer(v.typ_)) // inline of toRType(v.typ()), for own inlining in inline test
}
return v.typeSlow()
@@ -1539,6 +1536,11 @@ func (v Value) typeSlow() Type {
panic(&ValueError{"reflect.Value.Type", Invalid})
}
// closure func
if v.flag&flagClosure != 0 {
return toRType(&v.funcType().Type)
}
typ := v.typ()
if v.flag&flagMethod == 0 {
return toRType(v.typ())
@@ -2081,6 +2083,16 @@ func toFFISig(typ *abi.FuncType, closure bool) (*ffi.Signature, error) {
return ffi.NewSignature(ret, args...)
}
func (v Value) funcType() *abi.FuncType {
if v.flag&flagClosure != 0 {
t := v.typ()
ft := *t.StructType().Fields[0].Typ.FuncType()
ft.In = ft.In[1:]
return &ft
}
return v.typ().FuncType()
}
func (v Value) call(op string, in []Value) (out []Value) {
var (
fn unsafe.Pointer
@@ -2098,7 +2110,7 @@ func (v Value) call(op string, in []Value) (out []Value) {
fn = v.ptr
}
}
ft := v.typ().FuncType()
ft := v.funcType()
sig, err := toFFISig(ft, v.flag&flagClosure != 0)
if err != nil {
panic(err)