diff --git a/internal/abi/llgo_autogen.ll b/internal/abi/llgo_autogen.ll index 8018f1be..085e8b04 100644 --- a/internal/abi/llgo_autogen.ll +++ b/internal/abi/llgo_autogen.ll @@ -2,13 +2,14 @@ source_filename = "github.com/goplus/llgo/internal/abi" %"github.com/goplus/llgo/internal/abi.ArrayType" = type { %"github.com/goplus/llgo/internal/abi.Type", ptr, ptr, i64 } -%"github.com/goplus/llgo/internal/abi.Type" = type { i64, i64, i32, i8, i8, i8, i8, ptr, ptr, i32, i32 } +%"github.com/goplus/llgo/internal/abi.Type" = type { i64, i64, i32, i8, i8, i8, i8, %"github.com/goplus/llgo/internal/runtime.Closure", ptr, i32, i32 } +%"github.com/goplus/llgo/internal/runtime.Closure" = type { ptr, ptr } %"github.com/goplus/llgo/internal/abi.ChanType" = type { %"github.com/goplus/llgo/internal/abi.Type", ptr, i64 } %"github.com/goplus/llgo/internal/abi.FuncType" = type { %"github.com/goplus/llgo/internal/abi.Type", i16, i16 } %"github.com/goplus/llgo/internal/abi.InterfaceType" = type { %"github.com/goplus/llgo/internal/abi.Type", %"github.com/goplus/llgo/internal/abi.Name", %"github.com/goplus/llgo/internal/runtime.Slice" } %"github.com/goplus/llgo/internal/abi.Name" = type { ptr } %"github.com/goplus/llgo/internal/runtime.Slice" = type { ptr, i64, i64 } -%"github.com/goplus/llgo/internal/abi.MapType" = type { %"github.com/goplus/llgo/internal/abi.Type", ptr, ptr, ptr, ptr, i8, i8, i16, i32 } +%"github.com/goplus/llgo/internal/abi.MapType" = type { %"github.com/goplus/llgo/internal/abi.Type", ptr, ptr, ptr, %"github.com/goplus/llgo/internal/runtime.Closure", i8, i8, i16, i32 } %"github.com/goplus/llgo/internal/abi.PtrType" = type { %"github.com/goplus/llgo/internal/abi.Type", ptr } %"github.com/goplus/llgo/internal/abi.SliceType" = type { %"github.com/goplus/llgo/internal/abi.Type", ptr } %"github.com/goplus/llgo/internal/abi.StructType" = type { %"github.com/goplus/llgo/internal/abi.Type", %"github.com/goplus/llgo/internal/abi.Name", %"github.com/goplus/llgo/internal/runtime.Slice" } diff --git a/internal/runtime/llgo_autogen.ll b/internal/runtime/llgo_autogen.ll index bf1294e7..c242c8c2 100644 --- a/internal/runtime/llgo_autogen.ll +++ b/internal/runtime/llgo_autogen.ll @@ -4,8 +4,9 @@ source_filename = "github.com/goplus/llgo/internal/runtime" %"github.com/goplus/llgo/internal/runtime.String" = type { ptr, i64 } %"github.com/goplus/llgo/internal/runtime.iface" = type { ptr, ptr } %"github.com/goplus/llgo/internal/runtime.itab" = type { ptr, ptr, i32, [4 x i8], [1 x i64] } +%"github.com/goplus/llgo/internal/runtime.Closure" = type { ptr, ptr } %"github.com/goplus/llgo/internal/runtime.Slice" = type { ptr, i64, i64 } -%"github.com/goplus/llgo/internal/abi.Type" = type { i64, i64, i32, i8, i8, i8, i8, ptr, ptr, i32, i32 } +%"github.com/goplus/llgo/internal/abi.Type" = type { i64, i64, i32, i8, i8, i8, i8, %"github.com/goplus/llgo/internal/runtime.Closure", ptr, i32, i32 } %"github.com/goplus/llgo/internal/runtime.hmap" = type { i64, i8, i8, i16, i32, ptr, ptr, i64, ptr } @"github.com/goplus/llgo/internal/runtime.TyAny" = global ptr null @@ -211,6 +212,17 @@ _llgo_0: ret ptr %0 } +define %"github.com/goplus/llgo/internal/runtime.Closure" @"github.com/goplus/llgo/internal/runtime.NewClosure"(ptr %0, ptr %1) { +_llgo_0: + %2 = alloca %"github.com/goplus/llgo/internal/runtime.Closure", align 8 + %3 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Closure", ptr %2, i32 0, i32 0 + %4 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Closure", ptr %2, i32 0, i32 1 + store ptr %0, ptr %3, align 8 + store ptr %1, ptr %4, align 8 + %5 = load %"github.com/goplus/llgo/internal/runtime.Closure", ptr %2, align 8 + ret %"github.com/goplus/llgo/internal/runtime.Closure" %5 +} + define %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice"(ptr %0, i64 %1, i64 %2) { _llgo_0: %3 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 diff --git a/ssa/ssa_test.go b/ssa/ssa_test.go index ceaea2e4..ff8c21c3 100644 --- a/ssa/ssa_test.go +++ b/ssa/ssa_test.go @@ -30,6 +30,15 @@ func TestMakeInterface(t *testing.T) { } */ +func TestCFuncPtr(t *testing.T) { + sig := types.NewSignatureType(nil, nil, nil, nil, nil, false) + csig := (*CFuncPtr)(sig) + _ = csig.String() + if csig.Underlying() != sig { + t.Fatal("TestCFuncPtr failed") + } +} + func TestUserdefExpr(t *testing.T) { a := delayExprTy(nil) b := &phisExprTy{}