Merge pull request #833 from visualfc/funcaddr

cl: instr funcAddr support typec funclit

cl/_testrt/funcaddr/in.go

@@ -0,0 +1,24 @@
+package main
+
+import (
+	"unsafe"
+
+	"github.com/goplus/llgo/c"
+)
+
+//llgo:type C
+type Add func(int, int) int
+
+func add(a, b int) int {
+	return a + b
+}
+
+func main() {
+	var fn Add = add
+	var myfn Add = func(a, b int) int {
+		return a + b
+	}
+	println(c.Func(add) == c.Func(fn))
+	println(c.Func(fn) == *(*unsafe.Pointer)(unsafe.Pointer(&fn)))
+	println(c.Func(myfn) == *(*unsafe.Pointer)(unsafe.Pointer(&myfn)))
+}

cl/_testrt/funcaddr/out.ll

@@ -0,0 +1,66 @@
+; ModuleID = 'main'
+source_filename = "main"
+
+@"main.init$guard" = global i1 false, align 1
+@__llgo_argc = global i32 0, align 4
+@__llgo_argv = global ptr null, align 8
+
+define i64 @main.add(i64 %0, i64 %1) {
+_llgo_0:
+  %2 = add i64 %0, %1
+  ret i64 %2
+}
+
+define void @main.init() {
+_llgo_0:
+  %0 = load i1, ptr @"main.init$guard", align 1
+  br i1 %0, label %_llgo_2, label %_llgo_1
+
+_llgo_1:                                          ; preds = %_llgo_0
+  store i1 true, ptr @"main.init$guard", align 1
+  br label %_llgo_2
+
+_llgo_2:                                          ; preds = %_llgo_1, %_llgo_0
+  ret void
+}
+
+define i32 @main(i32 %0, ptr %1) {
+_llgo_0:
+  store i32 %0, ptr @__llgo_argc, align 4
+  store ptr %1, ptr @__llgo_argv, align 8
+  call void @"github.com/goplus/llgo/internal/runtime.init"()
+  call void @main.init()
+  %2 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 8)
+  store ptr @main.add, ptr %2, align 8
+  %3 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 8)
+  store ptr @"main.main$1", ptr %3, align 8
+  %4 = load ptr, ptr %2, align 8
+  %5 = icmp eq ptr @main.add, %4
+  call void @"github.com/goplus/llgo/internal/runtime.PrintBool"(i1 %5)
+  call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
+  %6 = load ptr, ptr %2, align 8
+  %7 = load ptr, ptr %2, align 8
+  %8 = icmp eq ptr %6, %7
+  call void @"github.com/goplus/llgo/internal/runtime.PrintBool"(i1 %8)
+  call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
+  %9 = load ptr, ptr %3, align 8
+  %10 = load ptr, ptr %3, align 8
+  %11 = icmp eq ptr %9, %10
+  call void @"github.com/goplus/llgo/internal/runtime.PrintBool"(i1 %11)
+  call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10)
+  ret i32 0
+}
+
+define i64 @"main.main$1"(i64 %0, i64 %1) {
+_llgo_0:
+  %2 = add i64 %0, %1
+  ret i64 %2
+}
+
+declare void @"github.com/goplus/llgo/internal/runtime.init"()
+
+declare ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64)
+
+declare void @"github.com/goplus/llgo/internal/runtime.PrintBool"(i1)
+
+declare void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8)

cl/instr.go

@@ -133,13 +133,19 @@ func (p *context) stringData(b llssa.Builder, args []ssa.Value) (ret llssa.Expr)
 }
 
 // func funcAddr(fn any) unsafe.Pointer
-func (p *context) funcAddr(_ llssa.Builder, args []ssa.Value) llssa.Expr {
+func (p *context) funcAddr(b llssa.Builder, args []ssa.Value) llssa.Expr {
 	if len(args) == 1 {
 		if fn, ok := args[0].(*ssa.MakeInterface); ok {
-			if fnDecl, ok := fn.X.(*ssa.Function); ok {
+			switch f := fn.X.(type) {
-				if aFn, _, _ := p.compileFunction(fnDecl); aFn != nil {
+			case *ssa.Function:
+				if aFn, _, _ := p.compileFunction(f); aFn != nil {
 					return aFn.Expr
 				}
+			default:
+				v := p.compileValue(b, f)
+				if _, ok := v.Type.RawType().Underlying().(*types.Signature); ok {
+					return v
+				}
 			}
 		}
 	}