diff --git a/cl/_testgo/errors/in.go b/cl/_testgo/errors/in.go index ada33367..fe7d2c7b 100644 --- a/cl/_testgo/errors/in.go +++ b/cl/_testgo/errors/in.go @@ -16,6 +16,8 @@ func (e *errorString) Error() string { } func main() { + println("main") err := New("an error") + println("err") println(err, err.Error()) } diff --git a/cl/_testgo/errors/out.ll b/cl/_testgo/errors/out.ll index ebded972..15d2af0d 100644 --- a/cl/_testgo/errors/out.ll +++ b/cl/_testgo/errors/out.ll @@ -4,24 +4,31 @@ source_filename = "main" %"github.com/goplus/llgo/internal/runtime.iface" = type { ptr, ptr } %"github.com/goplus/llgo/internal/runtime.String" = type { ptr, i64 } %main.errorString = type { %"github.com/goplus/llgo/internal/runtime.String" } -%"github.com/goplus/llgo/internal/abi.StructField" = type { %"github.com/goplus/llgo/internal/runtime.String", ptr, i64, %"github.com/goplus/llgo/internal/runtime.String", i1 } -%"github.com/goplus/llgo/internal/runtime.Slice" = type { ptr, i64, i64 } %"github.com/goplus/llgo/internal/abi.Imethod" = type { %"github.com/goplus/llgo/internal/runtime.String", ptr } +%"github.com/goplus/llgo/internal/runtime.Slice" = type { ptr, i64, i64 } +%"github.com/goplus/llgo/internal/abi.Method" = type { %"github.com/goplus/llgo/internal/runtime.String", ptr, ptr, ptr } +%"github.com/goplus/llgo/internal/abi.StructField" = type { %"github.com/goplus/llgo/internal/runtime.String", ptr, i64, %"github.com/goplus/llgo/internal/runtime.String", i1 } @"main.init$guard" = global ptr null @"*_llgo_main.errorString" = global ptr null @"_llgo_iface$Fh8eUJ-Gw4e6TYuajcFIOSCuqSPKAt5nS4ow7xeGXEU" = linkonce global ptr null @__llgo_argc = global ptr null @__llgo_argv = global ptr null -@0 = private unnamed_addr constant [9 x i8] c"an error\00", align 1 -@1 = private unnamed_addr constant [2 x i8] c"s\00", align 1 -@2 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@3 = private unnamed_addr constant [5 x i8] c"main\00", align 1 -@4 = private unnamed_addr constant [5 x i8] c"main\00", align 1 -@5 = private unnamed_addr constant [17 x i8] c"main.errorString\00", align 1 -@6 = private unnamed_addr constant [6 x i8] c"Error\00", align 1 +@0 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@1 = private unnamed_addr constant [9 x i8] c"an error\00", align 1 +@2 = private unnamed_addr constant [4 x i8] c"err\00", align 1 +@_llgo_main.errorString = global ptr null +@3 = private unnamed_addr constant [6 x i8] c"Error\00", align 1 @"_llgo_func$zNDVRsWTIpUPKouNUS805RGX--IV9qVK8B31IZbg5to" = linkonce global ptr null -@7 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@4 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@"main.struct$QTufDJA9wEDzuzgkA-ZSrLqW-B6lWN8O25mTSglAoLQ" = global ptr null +@5 = private unnamed_addr constant [6 x i8] c"Error\00", align 1 +@"_llgo_func$8LHAAczeMU-_MsqDJ4-62jHfhzpiOiRnFkBoaL3mfxg" = linkonce global ptr null +@6 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@7 = private unnamed_addr constant [17 x i8] c"main.errorString\00", align 1 +@8 = private unnamed_addr constant [2 x i8] c"s\00", align 1 +@9 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@10 = private unnamed_addr constant [5 x i8] c"main\00", align 1 define %"github.com/goplus/llgo/internal/runtime.iface" @main.New(%"github.com/goplus/llgo/internal/runtime.String" %0) { _llgo_0: @@ -54,7 +61,7 @@ _llgo_0: _llgo_1: ; preds = %_llgo_0 store i1 true, ptr @"main.init$guard", align 1 - call void @"main.init$abi"() + call void @"main.init$abi3"() br label %_llgo_2 _llgo_2: ; preds = %_llgo_1, %_llgo_0 @@ -71,25 +78,41 @@ _llgo_0: %3 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 0 store ptr @0, ptr %3, align 8 %4 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 1 - store i64 8, ptr %4, align 4 + store i64 4, ptr %4, align 4 %5 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %2, align 8 - %6 = call %"github.com/goplus/llgo/internal/runtime.iface" @main.New(%"github.com/goplus/llgo/internal/runtime.String" %5) - %7 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %6, 0 - %8 = getelementptr ptr, ptr %7, i64 3 - %9 = load ptr, ptr %8, align 8 - %10 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %6, 1 - %11 = alloca { ptr, ptr }, align 8 - %12 = getelementptr inbounds { ptr, ptr }, ptr %11, i32 0, i32 0 - store ptr %9, ptr %12, align 8 - %13 = getelementptr inbounds { ptr, ptr }, ptr %11, i32 0, i32 1 - store ptr %10, ptr %13, align 8 - %14 = load { ptr, ptr }, ptr %11, align 8 - %15 = extractvalue { ptr, ptr } %14, 1 - %16 = extractvalue { ptr, ptr } %14, 0 - %17 = call %"github.com/goplus/llgo/internal/runtime.String" %16(ptr %15) - call void @"github.com/goplus/llgo/internal/runtime.PrintIface"(%"github.com/goplus/llgo/internal/runtime.iface" %6) + call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %5) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) + %6 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %7 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %6, i32 0, i32 0 + store ptr @1, ptr %7, align 8 + %8 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %6, i32 0, i32 1 + store i64 8, ptr %8, align 4 + %9 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %6, align 8 + %10 = call %"github.com/goplus/llgo/internal/runtime.iface" @main.New(%"github.com/goplus/llgo/internal/runtime.String" %9) + %11 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %12 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %11, i32 0, i32 0 + store ptr @2, ptr %12, align 8 + %13 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %11, i32 0, i32 1 + store i64 3, ptr %13, align 4 + %14 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %11, align 8 + call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %14) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) + %15 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %10, 0 + %16 = getelementptr ptr, ptr %15, i64 3 + %17 = load ptr, ptr %16, align 8 + %18 = extractvalue %"github.com/goplus/llgo/internal/runtime.iface" %10, 1 + %19 = alloca { ptr, ptr }, align 8 + %20 = getelementptr inbounds { ptr, ptr }, ptr %19, i32 0, i32 0 + store ptr %17, ptr %20, align 8 + %21 = getelementptr inbounds { ptr, ptr }, ptr %19, i32 0, i32 1 + store ptr %18, ptr %21, align 8 + %22 = load { ptr, ptr }, ptr %19, align 8 + %23 = extractvalue { ptr, ptr } %22, 1 + %24 = extractvalue { ptr, ptr } %22, 0 + %25 = call %"github.com/goplus/llgo/internal/runtime.String" %24(ptr %23) + call void @"github.com/goplus/llgo/internal/runtime.PrintIface"(%"github.com/goplus/llgo/internal/runtime.iface" %10) call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32) - call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %17) + call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %25) call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) ret i32 0 } @@ -100,31 +123,172 @@ declare ptr @"github.com/goplus/llgo/internal/runtime.NewItab"(ptr, ptr) declare void @"github.com/goplus/llgo/internal/runtime.init"() -declare void @"github.com/goplus/llgo/internal/runtime.PrintIface"(%"github.com/goplus/llgo/internal/runtime.iface") +declare void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String") declare void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8) -declare void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String") +declare void @"github.com/goplus/llgo/internal/runtime.PrintIface"(%"github.com/goplus/llgo/internal/runtime.iface") define void @"main.init$abi"() { +_llgo_0: + call void @"main.init$abi2"() + %0 = load ptr, ptr @_llgo_main.errorString, align 8 + %1 = call ptr @"github.com/goplus/llgo/internal/runtime.PointerTo"(ptr %0) + store ptr %1, ptr @"*_llgo_main.errorString", align 8 + %2 = load ptr, ptr @"_llgo_iface$Fh8eUJ-Gw4e6TYuajcFIOSCuqSPKAt5nS4ow7xeGXEU", align 8 + %3 = icmp eq ptr %2, null + br i1 %3, label %_llgo_1, label %_llgo_2 + +_llgo_1: ; preds = %_llgo_0 + %4 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %5 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %4, i32 0, i32 0 + store ptr @3, ptr %5, align 8 + %6 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %4, i32 0, i32 1 + store i64 5, ptr %6, align 4 + %7 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %4, align 8 + %8 = load ptr, ptr @"_llgo_func$zNDVRsWTIpUPKouNUS805RGX--IV9qVK8B31IZbg5to", align 8 + %9 = alloca %"github.com/goplus/llgo/internal/abi.Imethod", align 8 + %10 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Imethod", ptr %9, i32 0, i32 0 + store %"github.com/goplus/llgo/internal/runtime.String" %7, ptr %10, align 8 + %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Imethod", ptr %9, i32 0, i32 1 + store ptr %8, ptr %11, align 8 + %12 = load %"github.com/goplus/llgo/internal/abi.Imethod", ptr %9, align 8 + %13 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 24) + %14 = getelementptr %"github.com/goplus/llgo/internal/abi.Imethod", ptr %13, i64 0 + store %"github.com/goplus/llgo/internal/abi.Imethod" %12, ptr %14, align 8 + %15 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %16 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %15, i32 0, i32 0 + store ptr %13, ptr %16, align 8 + %17 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %15, i32 0, i32 1 + store i64 1, ptr %17, align 4 + %18 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %15, i32 0, i32 2 + store i64 1, ptr %18, align 4 + %19 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %15, align 8 + %20 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %21 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %20, i32 0, i32 0 + store ptr @4, ptr %21, align 8 + %22 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %20, i32 0, i32 1 + store i64 4, ptr %22, align 4 + %23 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %20, align 8 + %24 = call ptr @"github.com/goplus/llgo/internal/runtime.Interface"(%"github.com/goplus/llgo/internal/runtime.String" %23, %"github.com/goplus/llgo/internal/runtime.Slice" %19) + store ptr %24, ptr @"_llgo_iface$Fh8eUJ-Gw4e6TYuajcFIOSCuqSPKAt5nS4ow7xeGXEU", align 8 + br label %_llgo_2 + +_llgo_2: ; preds = %_llgo_1, %_llgo_0 + ret void +} + +declare ptr @"github.com/goplus/llgo/internal/runtime.PointerTo"(ptr) + +declare ptr @"github.com/goplus/llgo/internal/runtime.Interface"(%"github.com/goplus/llgo/internal/runtime.String", %"github.com/goplus/llgo/internal/runtime.Slice") + +declare ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64) + +define void @"main.init$abi2"() { +_llgo_0: + call void @"main.init$abi3"() + %0 = load ptr, ptr @"main.struct$QTufDJA9wEDzuzgkA-ZSrLqW-B6lWN8O25mTSglAoLQ", align 8 + %1 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %2 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %1, i32 0, i32 0 + store ptr @5, ptr %2, align 8 + %3 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %1, i32 0, i32 1 + store i64 5, ptr %3, align 4 + %4 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %1, align 8 + %5 = load ptr, ptr @"_llgo_func$8LHAAczeMU-_MsqDJ4-62jHfhzpiOiRnFkBoaL3mfxg", align 8 + %6 = alloca %"github.com/goplus/llgo/internal/abi.Method", align 8 + %7 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Method", ptr %6, i32 0, i32 0 + store %"github.com/goplus/llgo/internal/runtime.String" %4, ptr %7, align 8 + %8 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Method", ptr %6, i32 0, i32 1 + store ptr %5, ptr %8, align 8 + %9 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Method", ptr %6, i32 0, i32 2 + store ptr @"(*main.errorString).Error", ptr %9, align 8 + %10 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Method", ptr %6, i32 0, i32 3 + store ptr @"(*main.errorString).Error", ptr %10, align 8 + %11 = load %"github.com/goplus/llgo/internal/abi.Method", ptr %6, align 8 + %12 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 40) + %13 = getelementptr %"github.com/goplus/llgo/internal/abi.Method", ptr %12, i64 0 + store %"github.com/goplus/llgo/internal/abi.Method" %11, ptr %13, align 8 + %14 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %15 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %14, i32 0, i32 0 + store ptr %12, ptr %15, align 8 + %16 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %14, i32 0, i32 1 + store i64 1, ptr %16, align 4 + %17 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %14, i32 0, i32 2 + store i64 1, ptr %17, align 4 + %18 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %14, align 8 + %19 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %20 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %19, i32 0, i32 0 + store ptr @6, ptr %20, align 8 + %21 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %19, i32 0, i32 1 + store i64 4, ptr %21, align 4 + %22 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %19, align 8 + %23 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %24 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %23, i32 0, i32 0 + store ptr @7, ptr %24, align 8 + %25 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %23, i32 0, i32 1 + store i64 16, ptr %25, align 4 + %26 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %23, align 8 + %27 = call ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String" %22, %"github.com/goplus/llgo/internal/runtime.String" %26, ptr %0, %"github.com/goplus/llgo/internal/runtime.Slice" %18) + store ptr %27, ptr @_llgo_main.errorString, align 8 + %28 = load ptr, ptr @"_llgo_func$zNDVRsWTIpUPKouNUS805RGX--IV9qVK8B31IZbg5to", align 8 + %29 = icmp eq ptr %28, null + br i1 %29, label %_llgo_1, label %_llgo_2 + +_llgo_1: ; preds = %_llgo_0 + %30 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 0) + %31 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %32 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %31, i32 0, i32 0 + store ptr %30, ptr %32, align 8 + %33 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %31, i32 0, i32 1 + store i64 0, ptr %33, align 4 + %34 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %31, i32 0, i32 2 + store i64 0, ptr %34, align 4 + %35 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %31, align 8 + %36 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 24) + %37 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8) + %38 = getelementptr ptr, ptr %37, i64 0 + store ptr %36, ptr %38, align 8 + %39 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %40 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %39, i32 0, i32 0 + store ptr %37, ptr %40, align 8 + %41 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %39, i32 0, i32 1 + store i64 1, ptr %41, align 4 + %42 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %39, i32 0, i32 2 + store i64 1, ptr %42, align 4 + %43 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %39, align 8 + %44 = call ptr @"github.com/goplus/llgo/internal/runtime.Func"(%"github.com/goplus/llgo/internal/runtime.Slice" %35, %"github.com/goplus/llgo/internal/runtime.Slice" %43, i1 false) + store ptr %44, ptr @"_llgo_func$zNDVRsWTIpUPKouNUS805RGX--IV9qVK8B31IZbg5to", align 8 + br label %_llgo_2 + +_llgo_2: ; preds = %_llgo_1, %_llgo_0 + ret void +} + +declare ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String", %"github.com/goplus/llgo/internal/runtime.String", ptr, %"github.com/goplus/llgo/internal/runtime.Slice") + +declare ptr @"github.com/goplus/llgo/internal/runtime.Func"(%"github.com/goplus/llgo/internal/runtime.Slice", %"github.com/goplus/llgo/internal/runtime.Slice", i1) + +declare ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64) + +define void @"main.init$abi3"() { _llgo_0: %0 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %1 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %0, i32 0, i32 0 - store ptr @1, ptr %1, align 8 + store ptr @8, ptr %1, align 8 %2 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %0, i32 0, i32 1 store i64 1, ptr %2, align 4 %3 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %0, align 8 %4 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 24) %5 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %6 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %5, i32 0, i32 0 - store ptr @2, ptr %6, align 8 + store ptr @9, ptr %6, align 8 %7 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %5, i32 0, i32 1 store i64 0, ptr %7, align 4 %8 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %5, align 8 %9 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %3, ptr %4, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %8, i1 false) %10 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %10, i32 0, i32 0 - store ptr @3, ptr %11, align 8 + store ptr @10, ptr %11, align 8 %12 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %10, i32 0, i32 1 store i64 4, ptr %12, align 4 %13 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %10, align 8 @@ -140,58 +304,38 @@ _llgo_0: store i64 1, ptr %19, align 4 %20 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %16, align 8 %21 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %13, i64 16, %"github.com/goplus/llgo/internal/runtime.Slice" %20) - %22 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %23 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %22, i32 0, i32 0 - store ptr @4, ptr %23, align 8 - %24 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %22, i32 0, i32 1 - store i64 4, ptr %24, align 4 - %25 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %22, align 8 - %26 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %27 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %26, i32 0, i32 0 - store ptr @5, ptr %27, align 8 - %28 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %26, i32 0, i32 1 - store i64 16, ptr %28, align 4 - %29 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %26, align 8 - %30 = call ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String" %25, %"github.com/goplus/llgo/internal/runtime.String" %29, ptr %21, { ptr, i64, i64 } zeroinitializer) - %31 = call ptr @"github.com/goplus/llgo/internal/runtime.PointerTo"(ptr %30) - store ptr %31, ptr @"*_llgo_main.errorString", align 8 - %32 = load ptr, ptr @"_llgo_iface$Fh8eUJ-Gw4e6TYuajcFIOSCuqSPKAt5nS4ow7xeGXEU", align 8 - %33 = icmp eq ptr %32, null - br i1 %33, label %_llgo_1, label %_llgo_2 + store ptr %21, ptr @"main.struct$QTufDJA9wEDzuzgkA-ZSrLqW-B6lWN8O25mTSglAoLQ", align 8 + %22 = load ptr, ptr @"_llgo_func$8LHAAczeMU-_MsqDJ4-62jHfhzpiOiRnFkBoaL3mfxg", align 8 + %23 = icmp eq ptr %22, null + br i1 %23, label %_llgo_1, label %_llgo_2 _llgo_1: ; preds = %_llgo_0 - %34 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %35 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %34, i32 0, i32 0 - store ptr @6, ptr %35, align 8 - %36 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %34, i32 0, i32 1 - store i64 5, ptr %36, align 4 - %37 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %34, align 8 - %38 = load ptr, ptr @"_llgo_func$zNDVRsWTIpUPKouNUS805RGX--IV9qVK8B31IZbg5to", align 8 - %39 = alloca %"github.com/goplus/llgo/internal/abi.Imethod", align 8 - %40 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Imethod", ptr %39, i32 0, i32 0 - store %"github.com/goplus/llgo/internal/runtime.String" %37, ptr %40, align 8 - %41 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Imethod", ptr %39, i32 0, i32 1 - store ptr %38, ptr %41, align 8 - %42 = load %"github.com/goplus/llgo/internal/abi.Imethod", ptr %39, align 8 - %43 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 24) - %44 = getelementptr %"github.com/goplus/llgo/internal/abi.Imethod", ptr %43, i64 0 - store %"github.com/goplus/llgo/internal/abi.Imethod" %42, ptr %44, align 8 - %45 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 - %46 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %45, i32 0, i32 0 - store ptr %43, ptr %46, align 8 - %47 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %45, i32 0, i32 1 - store i64 1, ptr %47, align 4 - %48 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %45, i32 0, i32 2 - store i64 1, ptr %48, align 4 - %49 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %45, align 8 - %50 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %51 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %50, i32 0, i32 0 - store ptr @7, ptr %51, align 8 - %52 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %50, i32 0, i32 1 - store i64 4, ptr %52, align 4 - %53 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %50, align 8 - %54 = call ptr @"github.com/goplus/llgo/internal/runtime.Interface"(%"github.com/goplus/llgo/internal/runtime.String" %53, %"github.com/goplus/llgo/internal/runtime.Slice" %49) - store ptr %54, ptr @"_llgo_iface$Fh8eUJ-Gw4e6TYuajcFIOSCuqSPKAt5nS4ow7xeGXEU", align 8 + %24 = load ptr, ptr @"*_llgo_main.errorString", align 8 + %25 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8) + %26 = getelementptr ptr, ptr %25, i64 0 + store ptr %24, ptr %26, align 8 + %27 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %28 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %27, i32 0, i32 0 + store ptr %25, ptr %28, align 8 + %29 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %27, i32 0, i32 1 + store i64 1, ptr %29, align 4 + %30 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %27, i32 0, i32 2 + store i64 1, ptr %30, align 4 + %31 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %27, align 8 + %32 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 24) + %33 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8) + %34 = getelementptr ptr, ptr %33, i64 0 + store ptr %32, ptr %34, align 8 + %35 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %36 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %35, i32 0, i32 0 + store ptr %33, ptr %36, align 8 + %37 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %35, i32 0, i32 1 + store i64 1, ptr %37, align 4 + %38 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %35, i32 0, i32 2 + store i64 1, ptr %38, align 4 + %39 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %35, align 8 + %40 = call ptr @"github.com/goplus/llgo/internal/runtime.Func"(%"github.com/goplus/llgo/internal/runtime.Slice" %31, %"github.com/goplus/llgo/internal/runtime.Slice" %39, i1 false) + store ptr %40, ptr @"_llgo_func$8LHAAczeMU-_MsqDJ4-62jHfhzpiOiRnFkBoaL3mfxg", align 8 br label %_llgo_2 _llgo_2: ; preds = %_llgo_1, %_llgo_0 @@ -201,13 +345,3 @@ _llgo_2: ; preds = %_llgo_1, %_llgo_0 declare ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String", i64, %"github.com/goplus/llgo/internal/runtime.Slice") declare %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String", ptr, i64, %"github.com/goplus/llgo/internal/runtime.String", i1) - -declare ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64) - -declare ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64) - -declare ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String", %"github.com/goplus/llgo/internal/runtime.String", ptr, %"github.com/goplus/llgo/internal/runtime.Slice") - -declare ptr @"github.com/goplus/llgo/internal/runtime.PointerTo"(ptr) - -declare ptr @"github.com/goplus/llgo/internal/runtime.Interface"(%"github.com/goplus/llgo/internal/runtime.String", %"github.com/goplus/llgo/internal/runtime.Slice") diff --git a/cl/_testgo/struczero/out.ll b/cl/_testgo/struczero/out.ll index 8cdac1ca..5395f099 100644 --- a/cl/_testgo/struczero/out.ll +++ b/cl/_testgo/struczero/out.ll @@ -5,8 +5,9 @@ source_filename = "main" %"github.com/goplus/llgo/internal/runtime.eface" = type { ptr, ptr } %main.bar = type { ptr, float } %"github.com/goplus/llgo/internal/runtime.String" = type { ptr, i64 } -%"github.com/goplus/llgo/internal/abi.StructField" = type { %"github.com/goplus/llgo/internal/runtime.String", ptr, i64, %"github.com/goplus/llgo/internal/runtime.String", i1 } +%"github.com/goplus/llgo/internal/abi.Method" = type { %"github.com/goplus/llgo/internal/runtime.String", ptr, ptr, ptr } %"github.com/goplus/llgo/internal/runtime.Slice" = type { ptr, i64, i64 } +%"github.com/goplus/llgo/internal/abi.StructField" = type { %"github.com/goplus/llgo/internal/runtime.String", ptr, i64, %"github.com/goplus/llgo/internal/runtime.String", i1 } @"main.init$guard" = global ptr null @"_llgo_github.com/goplus/llgo/cl/internal/foo.Foo" = linkonce global ptr null @@ -14,21 +15,25 @@ source_filename = "main" @__llgo_argc = global ptr null @__llgo_argv = global ptr null @0 = private unnamed_addr constant [7 x i8] c"notOk:\00", align 1 -@1 = private unnamed_addr constant [3 x i8] c"pb\00", align 1 +@"main.struct$qQwZyFy_4JRalRxVVsVD8R09X5t58tWjTrtJPtHbEjs" = global ptr null +@1 = private unnamed_addr constant [3 x i8] c"Pb\00", align 1 +@"_llgo_func$9WyRPk13jhLNuX5vkY3DFEfqvowhmGCLb2eJ8uGOVkM" = linkonce global ptr null +@2 = private unnamed_addr constant [39 x i8] c"github.com/goplus/llgo/cl/internal/foo\00", align 1 +@3 = private unnamed_addr constant [43 x i8] c"github.com/goplus/llgo/cl/internal/foo.Foo\00", align 1 +@"main.struct$Ci43nzKYkRLddRL_N4mkykxLXfJlqJGS5n04LKThPNo" = global ptr null +@4 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@5 = private unnamed_addr constant [9 x i8] c"main.bar\00", align 1 +@6 = private unnamed_addr constant [3 x i8] c"pb\00", align 1 @"*_llgo_byte" = linkonce global ptr null -@2 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@3 = private unnamed_addr constant [2 x i8] c"F\00", align 1 -@4 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@5 = private unnamed_addr constant [5 x i8] c"main\00", align 1 -@6 = private unnamed_addr constant [39 x i8] c"github.com/goplus/llgo/cl/internal/foo\00", align 1 -@7 = private unnamed_addr constant [43 x i8] c"github.com/goplus/llgo/cl/internal/foo.Foo\00", align 1 -@8 = private unnamed_addr constant [3 x i8] c"pb\00", align 1 +@7 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@8 = private unnamed_addr constant [2 x i8] c"F\00", align 1 @9 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@10 = private unnamed_addr constant [2 x i8] c"f\00", align 1 -@11 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@12 = private unnamed_addr constant [5 x i8] c"main\00", align 1 -@13 = private unnamed_addr constant [5 x i8] c"main\00", align 1 -@14 = private unnamed_addr constant [9 x i8] c"main.bar\00", align 1 +@10 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@11 = private unnamed_addr constant [3 x i8] c"pb\00", align 1 +@12 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@13 = private unnamed_addr constant [2 x i8] c"f\00", align 1 +@14 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@15 = private unnamed_addr constant [5 x i8] c"main\00", align 1 define { %"github.com/goplus/llgo/cl/internal/foo.Foo", i1 } @main.Bar(%"github.com/goplus/llgo/internal/runtime.eface" %0) { _llgo_0: @@ -110,7 +115,7 @@ _llgo_0: _llgo_1: ; preds = %_llgo_0 store i1 true, ptr @"main.init$guard", align 1 call void @"github.com/goplus/llgo/cl/internal/foo.init"() - call void @"main.init$abi"() + call void @"main.init$abi3"() br label %_llgo_2 _llgo_2: ; preds = %_llgo_1, %_llgo_0 @@ -200,138 +205,222 @@ declare ptr @"(github.com/goplus/llgo/cl/internal/foo.Foo).Pb"(%"github.com/gopl define void @"main.init$abi"() { _llgo_0: + call void @"main.init$abi2"() %0 = load ptr, ptr @"_llgo_github.com/goplus/llgo/cl/internal/foo.Foo", align 8 %1 = icmp eq ptr %0, null br i1 %1, label %_llgo_1, label %_llgo_2 _llgo_1: ; preds = %_llgo_0 - %2 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %3 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 0 - store ptr @1, ptr %3, align 8 - %4 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %2, i32 0, i32 1 - store i64 2, ptr %4, align 4 - %5 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %2, align 8 - %6 = load ptr, ptr @"*_llgo_byte", align 8 - %7 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %8 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %7, i32 0, i32 0 - store ptr @2, ptr %8, align 8 - %9 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %7, i32 0, i32 1 - store i64 0, ptr %9, align 4 - %10 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %7, align 8 - %11 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %5, ptr %6, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %10, i1 false) - %12 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %13 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %12, i32 0, i32 0 - store ptr @3, ptr %13, align 8 - %14 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %12, i32 0, i32 1 - store i64 1, ptr %14, align 4 - %15 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %12, align 8 - %16 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 13) - %17 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %18 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %17, i32 0, i32 0 - store ptr @4, ptr %18, align 8 - %19 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %17, i32 0, i32 1 - store i64 0, ptr %19, align 4 - %20 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %17, align 8 - %21 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %15, ptr %16, i64 8, %"github.com/goplus/llgo/internal/runtime.String" %20, i1 false) - %22 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %23 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %22, i32 0, i32 0 - store ptr @5, ptr %23, align 8 - %24 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %22, i32 0, i32 1 - store i64 4, ptr %24, align 4 - %25 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %22, align 8 - %26 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 112) - %27 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %26, i64 0 - store %"github.com/goplus/llgo/internal/abi.StructField" %11, ptr %27, align 8 - %28 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %26, i64 1 - store %"github.com/goplus/llgo/internal/abi.StructField" %21, ptr %28, align 8 - %29 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 - %30 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %29, i32 0, i32 0 - store ptr %26, ptr %30, align 8 - %31 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %29, i32 0, i32 1 - store i64 2, ptr %31, align 4 - %32 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %29, i32 0, i32 2 - store i64 2, ptr %32, align 4 - %33 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %29, align 8 - %34 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %25, i64 16, %"github.com/goplus/llgo/internal/runtime.Slice" %33) - %35 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %36 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %35, i32 0, i32 0 - store ptr @6, ptr %36, align 8 - %37 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %35, i32 0, i32 1 - store i64 38, ptr %37, align 4 - %38 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %35, align 8 - %39 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %40 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %39, i32 0, i32 0 - store ptr @7, ptr %40, align 8 - %41 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %39, i32 0, i32 1 - store i64 42, ptr %41, align 4 - %42 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %39, align 8 - %43 = call ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String" %38, %"github.com/goplus/llgo/internal/runtime.String" %42, ptr %34, { ptr, i64, i64 } zeroinitializer) - store ptr %43, ptr @"_llgo_github.com/goplus/llgo/cl/internal/foo.Foo", align 8 + %2 = load ptr, ptr @"main.struct$qQwZyFy_4JRalRxVVsVD8R09X5t58tWjTrtJPtHbEjs", align 8 + %3 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %4 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %3, i32 0, i32 0 + store ptr @1, ptr %4, align 8 + %5 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %3, i32 0, i32 1 + store i64 2, ptr %5, align 4 + %6 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %3, align 8 + %7 = load ptr, ptr @"_llgo_func$9WyRPk13jhLNuX5vkY3DFEfqvowhmGCLb2eJ8uGOVkM", align 8 + %8 = alloca %"github.com/goplus/llgo/internal/abi.Method", align 8 + %9 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Method", ptr %8, i32 0, i32 0 + store %"github.com/goplus/llgo/internal/runtime.String" %6, ptr %9, align 8 + %10 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Method", ptr %8, i32 0, i32 1 + store ptr %7, ptr %10, align 8 + %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Method", ptr %8, i32 0, i32 2 + store ptr @"(github.com/goplus/llgo/cl/internal/foo.Foo).Pb", ptr %11, align 8 + %12 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Method", ptr %8, i32 0, i32 3 + store ptr @"(github.com/goplus/llgo/cl/internal/foo.Foo).Pb", ptr %12, align 8 + %13 = load %"github.com/goplus/llgo/internal/abi.Method", ptr %8, align 8 + %14 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 40) + %15 = getelementptr %"github.com/goplus/llgo/internal/abi.Method", ptr %14, i64 0 + store %"github.com/goplus/llgo/internal/abi.Method" %13, ptr %15, align 8 + %16 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %17 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %16, i32 0, i32 0 + store ptr %14, ptr %17, align 8 + %18 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %16, i32 0, i32 1 + store i64 1, ptr %18, align 4 + %19 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %16, i32 0, i32 2 + store i64 1, ptr %19, align 4 + %20 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %16, align 8 + %21 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %22 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %21, i32 0, i32 0 + store ptr @2, ptr %22, align 8 + %23 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %21, i32 0, i32 1 + store i64 38, ptr %23, align 4 + %24 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %21, align 8 + %25 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %26 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %25, i32 0, i32 0 + store ptr @3, ptr %26, align 8 + %27 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %25, i32 0, i32 1 + store i64 42, ptr %27, align 4 + %28 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %25, align 8 + %29 = call ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String" %24, %"github.com/goplus/llgo/internal/runtime.String" %28, ptr %2, %"github.com/goplus/llgo/internal/runtime.Slice" %20) + store ptr %29, ptr @"_llgo_github.com/goplus/llgo/cl/internal/foo.Foo", align 8 br label %_llgo_2 _llgo_2: ; preds = %_llgo_1, %_llgo_0 - %44 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %45 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %44, i32 0, i32 0 - store ptr @8, ptr %45, align 8 - %46 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %44, i32 0, i32 1 - store i64 2, ptr %46, align 4 - %47 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %44, align 8 - %48 = load ptr, ptr @"*_llgo_byte", align 8 - %49 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %50 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %49, i32 0, i32 0 - store ptr @9, ptr %50, align 8 - %51 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %49, i32 0, i32 1 - store i64 0, ptr %51, align 4 - %52 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %49, align 8 - %53 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %47, ptr %48, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %52, i1 false) - %54 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %55 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %54, i32 0, i32 0 - store ptr @10, ptr %55, align 8 - %56 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %54, i32 0, i32 1 - store i64 1, ptr %56, align 4 - %57 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %54, align 8 - %58 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 13) - %59 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %60 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %59, i32 0, i32 0 - store ptr @11, ptr %60, align 8 - %61 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %59, i32 0, i32 1 - store i64 0, ptr %61, align 4 - %62 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %59, align 8 - %63 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %57, ptr %58, i64 8, %"github.com/goplus/llgo/internal/runtime.String" %62, i1 false) - %64 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %65 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %64, i32 0, i32 0 - store ptr @12, ptr %65, align 8 - %66 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %64, i32 0, i32 1 - store i64 4, ptr %66, align 4 - %67 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %64, align 8 - %68 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 112) - %69 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %68, i64 0 - store %"github.com/goplus/llgo/internal/abi.StructField" %53, ptr %69, align 8 - %70 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %68, i64 1 - store %"github.com/goplus/llgo/internal/abi.StructField" %63, ptr %70, align 8 - %71 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 - %72 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %71, i32 0, i32 0 - store ptr %68, ptr %72, align 8 - %73 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %71, i32 0, i32 1 - store i64 2, ptr %73, align 4 - %74 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %71, i32 0, i32 2 - store i64 2, ptr %74, align 4 - %75 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %71, align 8 - %76 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %67, i64 16, %"github.com/goplus/llgo/internal/runtime.Slice" %75) - %77 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %78 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %77, i32 0, i32 0 - store ptr @13, ptr %78, align 8 - %79 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %77, i32 0, i32 1 - store i64 4, ptr %79, align 4 - %80 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %77, align 8 - %81 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %82 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %81, i32 0, i32 0 - store ptr @14, ptr %82, align 8 - %83 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %81, i32 0, i32 1 - store i64 8, ptr %83, align 4 - %84 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %81, align 8 - %85 = call ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String" %80, %"github.com/goplus/llgo/internal/runtime.String" %84, ptr %76, { ptr, i64, i64 } zeroinitializer) - store ptr %85, ptr @_llgo_main.bar, align 8 + %30 = load ptr, ptr @"main.struct$Ci43nzKYkRLddRL_N4mkykxLXfJlqJGS5n04LKThPNo", align 8 + %31 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 0) + %32 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %33 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %32, i32 0, i32 0 + store ptr %31, ptr %33, align 8 + %34 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %32, i32 0, i32 1 + store i64 0, ptr %34, align 4 + %35 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %32, i32 0, i32 2 + store i64 0, ptr %35, align 4 + %36 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %32, align 8 + %37 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %38 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %37, i32 0, i32 0 + store ptr @4, ptr %38, align 8 + %39 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %37, i32 0, i32 1 + store i64 4, ptr %39, align 4 + %40 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %37, align 8 + %41 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %42 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %41, i32 0, i32 0 + store ptr @5, ptr %42, align 8 + %43 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %41, i32 0, i32 1 + store i64 8, ptr %43, align 4 + %44 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %41, align 8 + %45 = call ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String" %40, %"github.com/goplus/llgo/internal/runtime.String" %44, ptr %30, %"github.com/goplus/llgo/internal/runtime.Slice" %36) + store ptr %45, ptr @_llgo_main.bar, align 8 + ret void +} + +declare ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String", %"github.com/goplus/llgo/internal/runtime.String", ptr, %"github.com/goplus/llgo/internal/runtime.Slice") + +define void @"main.init$abi2"() { +_llgo_0: + call void @"main.init$abi3"() + %0 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %1 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %0, i32 0, i32 0 + store ptr @6, ptr %1, align 8 + %2 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %0, i32 0, i32 1 + store i64 2, ptr %2, align 4 + %3 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %0, align 8 + %4 = load ptr, ptr @"*_llgo_byte", align 8 + %5 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %6 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %5, i32 0, i32 0 + store ptr @7, ptr %6, align 8 + %7 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %5, i32 0, i32 1 + store i64 0, ptr %7, align 4 + %8 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %5, align 8 + %9 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %3, ptr %4, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %8, i1 false) + %10 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %10, i32 0, i32 0 + store ptr @8, ptr %11, align 8 + %12 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %10, i32 0, i32 1 + store i64 1, ptr %12, align 4 + %13 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %10, align 8 + %14 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 13) + %15 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %16 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %15, i32 0, i32 0 + store ptr @9, ptr %16, align 8 + %17 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %15, i32 0, i32 1 + store i64 0, ptr %17, align 4 + %18 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %15, align 8 + %19 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %13, ptr %14, i64 8, %"github.com/goplus/llgo/internal/runtime.String" %18, i1 false) + %20 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %21 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %20, i32 0, i32 0 + store ptr @10, ptr %21, align 8 + %22 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %20, i32 0, i32 1 + store i64 4, ptr %22, align 4 + %23 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %20, align 8 + %24 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 112) + %25 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %24, i64 0 + store %"github.com/goplus/llgo/internal/abi.StructField" %9, ptr %25, align 8 + %26 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %24, i64 1 + store %"github.com/goplus/llgo/internal/abi.StructField" %19, ptr %26, align 8 + %27 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %28 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %27, i32 0, i32 0 + store ptr %24, ptr %28, align 8 + %29 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %27, i32 0, i32 1 + store i64 2, ptr %29, align 4 + %30 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %27, i32 0, i32 2 + store i64 2, ptr %30, align 4 + %31 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %27, align 8 + %32 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %23, i64 16, %"github.com/goplus/llgo/internal/runtime.Slice" %31) + store ptr %32, ptr @"main.struct$qQwZyFy_4JRalRxVVsVD8R09X5t58tWjTrtJPtHbEjs", align 8 + %33 = load ptr, ptr @"_llgo_func$9WyRPk13jhLNuX5vkY3DFEfqvowhmGCLb2eJ8uGOVkM", align 8 + %34 = icmp eq ptr %33, null + br i1 %34, label %_llgo_1, label %_llgo_2 + +_llgo_1: ; preds = %_llgo_0 + %35 = load ptr, ptr @"_llgo_github.com/goplus/llgo/cl/internal/foo.Foo", align 8 + %36 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8) + %37 = getelementptr ptr, ptr %36, i64 0 + store ptr %35, ptr %37, align 8 + %38 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %39 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %38, i32 0, i32 0 + store ptr %36, ptr %39, align 8 + %40 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %38, i32 0, i32 1 + store i64 1, ptr %40, align 4 + %41 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %38, i32 0, i32 2 + store i64 1, ptr %41, align 4 + %42 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %38, align 8 + %43 = load ptr, ptr @"*_llgo_byte", align 8 + %44 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 8) + %45 = getelementptr ptr, ptr %44, i64 0 + store ptr %43, ptr %45, align 8 + %46 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %47 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %46, i32 0, i32 0 + store ptr %44, ptr %47, align 8 + %48 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %46, i32 0, i32 1 + store i64 1, ptr %48, align 4 + %49 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %46, i32 0, i32 2 + store i64 1, ptr %49, align 4 + %50 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %46, align 8 + %51 = call ptr @"github.com/goplus/llgo/internal/runtime.Func"(%"github.com/goplus/llgo/internal/runtime.Slice" %42, %"github.com/goplus/llgo/internal/runtime.Slice" %50, i1 false) + store ptr %51, ptr @"_llgo_func$9WyRPk13jhLNuX5vkY3DFEfqvowhmGCLb2eJ8uGOVkM", align 8 + br label %_llgo_2 + +_llgo_2: ; preds = %_llgo_1, %_llgo_0 + %52 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %53 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %52, i32 0, i32 0 + store ptr @11, ptr %53, align 8 + %54 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %52, i32 0, i32 1 + store i64 2, ptr %54, align 4 + %55 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %52, align 8 + %56 = load ptr, ptr @"*_llgo_byte", align 8 + %57 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %58 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %57, i32 0, i32 0 + store ptr @12, ptr %58, align 8 + %59 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %57, i32 0, i32 1 + store i64 0, ptr %59, align 4 + %60 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %57, align 8 + %61 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %55, ptr %56, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %60, i1 false) + %62 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %63 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %62, i32 0, i32 0 + store ptr @13, ptr %63, align 8 + %64 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %62, i32 0, i32 1 + store i64 1, ptr %64, align 4 + %65 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %62, align 8 + %66 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 13) + %67 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %68 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %67, i32 0, i32 0 + store ptr @14, ptr %68, align 8 + %69 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %67, i32 0, i32 1 + store i64 0, ptr %69, align 4 + %70 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %67, align 8 + %71 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %65, ptr %66, i64 8, %"github.com/goplus/llgo/internal/runtime.String" %70, i1 false) + %72 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %73 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %72, i32 0, i32 0 + store ptr @15, ptr %73, align 8 + %74 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %72, i32 0, i32 1 + store i64 4, ptr %74, align 4 + %75 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %72, align 8 + %76 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 112) + %77 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %76, i64 0 + store %"github.com/goplus/llgo/internal/abi.StructField" %61, ptr %77, align 8 + %78 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %76, i64 1 + store %"github.com/goplus/llgo/internal/abi.StructField" %71, ptr %78, align 8 + %79 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %80 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %79, i32 0, i32 0 + store ptr %76, ptr %80, align 8 + %81 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %79, i32 0, i32 1 + store i64 2, ptr %81, align 4 + %82 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %79, i32 0, i32 2 + store i64 2, ptr %82, align 4 + %83 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %79, align 8 + %84 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %75, i64 16, %"github.com/goplus/llgo/internal/runtime.Slice" %83) + store ptr %84, ptr @"main.struct$Ci43nzKYkRLddRL_N4mkykxLXfJlqJGS5n04LKThPNo", align 8 ret void } @@ -341,4 +430,22 @@ declare %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/l declare ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64) -declare ptr @"github.com/goplus/llgo/internal/runtime.Named"(%"github.com/goplus/llgo/internal/runtime.String", %"github.com/goplus/llgo/internal/runtime.String", ptr, %"github.com/goplus/llgo/internal/runtime.Slice") +declare ptr @"github.com/goplus/llgo/internal/runtime.Func"(%"github.com/goplus/llgo/internal/runtime.Slice", %"github.com/goplus/llgo/internal/runtime.Slice", i1) + +define void @"main.init$abi3"() { +_llgo_0: + %0 = load ptr, ptr @"*_llgo_byte", align 8 + %1 = icmp eq ptr %0, null + br i1 %1, label %_llgo_1, label %_llgo_2 + +_llgo_1: ; preds = %_llgo_0 + %2 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 8) + %3 = call ptr @"github.com/goplus/llgo/internal/runtime.PointerTo"(ptr %2) + store ptr %3, ptr @"*_llgo_byte", align 8 + br label %_llgo_2 + +_llgo_2: ; preds = %_llgo_1, %_llgo_0 + ret void +} + +declare ptr @"github.com/goplus/llgo/internal/runtime.PointerTo"(ptr) diff --git a/cl/import.go b/cl/import.go index f59f0ac6..0ed5c55d 100644 --- a/cl/import.go +++ b/cl/import.go @@ -280,21 +280,7 @@ func typesFuncName(pkgPath string, fn *types.Func) (fullName, inPkgName string) // - method: (pkg.T).name, (*pkg.T).name func funcName(pkg *types.Package, fn *ssa.Function) string { sig := fn.Signature - name := fn.Name() - if recv := sig.Recv(); recv != nil { - var tName string - t := recv.Type() - if tp, ok := t.(*types.Pointer); ok { - t, tName = tp.Elem(), "*" - } - tName += llssa.NameOf(t.(*types.Named)) - return "(" + tName + ")." + name - } - ret := llssa.FullName(pkg, name) - if ret == "main.main" { - ret = "main" - } - return ret + return llssa.FuncName(pkg, fn.Name(), sig.Recv()) } func checkCgo(fnName string) bool { diff --git a/internal/runtime/llgo_autogen.lla b/internal/runtime/llgo_autogen.lla index 349f274c..ad834471 100644 Binary files a/internal/runtime/llgo_autogen.lla and b/internal/runtime/llgo_autogen.lla differ diff --git a/ssa/interface.go b/ssa/interface.go index 86fa5762..8625203e 100644 --- a/ssa/interface.go +++ b/ssa/interface.go @@ -93,6 +93,21 @@ func (b Builder) abiImethodOf(m *types.Func) Expr { return b.aggregateValue(prog.rtType("Imethod"), name.impl, typ.impl) } +// Method{name string, typ *FuncType, ifn, tfn abi.Text} +func (b Builder) abiMethodOf(m *types.Func) Expr { + prog := b.Prog + mName := m.Name() + mSig := m.Type().(*types.Signature) + fullName := FuncName(m.Pkg(), mName, mSig.Recv()) + name := b.Str(mName) + fn := b.Pkg.NewFunc(fullName, mSig, InGo) + sig := fn.raw.Type.(*types.Signature) + sig = types.NewSignatureType(nil, nil, nil, sig.Params(), sig.Results(), sig.Variadic()) + typ := b.abiType(sig) + // TODO(xsw): ifn, tfn + return b.aggregateValue(prog.rtType("Method"), name.impl, typ.impl, fn.impl, fn.impl) +} + // func Interface(pkgPath string, methods []abi.Imethod) func (b Builder) abiInterfaceOf(t *types.Interface) Expr { prog := b.Prog @@ -112,21 +127,32 @@ func (b Builder) abiInterfaceOf(t *types.Interface) Expr { // func Named(pkgPath, name string, underlying *Type, methods []abi.Method) func (b Builder) abiNamedOf(t *types.Named) Expr { - under := b.abiTypeOf(t.Underlying()) + tunder := t.Underlying() + under := b.abiType(tunder) path := abi.PathOf(t.Obj().Pkg()) name := NameOf(t) - prog := b.Prog pkg := b.Pkg - fn := pkg.rtFunc("Named") - tSlice := lastParamType(prog, fn) - // TODO(xsw): methods - methods := prog.Zero(tSlice) + + var fn = pkg.rtFunc("Named") + var tSlice = lastParamType(prog, fn) + var methods Expr + if _, ok := tunder.(*types.Interface); ok { + methods = prog.Zero(tSlice) + } else { + n := t.NumMethods() + mths := make([]Expr, n) + for i := 0; i < n; i++ { + m := t.Method(i) + mths[i] = b.abiMethodOf(m) + } + methods = b.SliceLit(tSlice, mths...) + } return b.Call(fn, b.Str(path), b.Str(name), under, methods) } func (b Builder) abiPointerOf(t *types.Pointer) Expr { - elem := b.abiTypeOf(t.Elem()) + elem := b.abiType(t.Elem()) return b.Call(b.Pkg.rtFunc("PointerTo"), elem) } @@ -226,8 +252,7 @@ func (b Builder) unsafeInterface(rawIntf *types.Interface, t Expr, data llvm.Val return b.unsafeIface(itab.impl, data) } -func iMethodOf(rawIntf *types.Interface, method *types.Func) int { - name := method.Name() +func iMethodOf(rawIntf *types.Interface, name string) int { n := rawIntf.NumMethods() for i := 0; i < n; i++ { m := rawIntf.Method(i) @@ -243,11 +268,11 @@ func iMethodOf(rawIntf *types.Interface, method *types.Func) int { func (b Builder) Imethod(intf Expr, method *types.Func) Expr { prog := b.Prog rawIntf := intf.raw.Type.Underlying().(*types.Interface) - i := iMethodOf(rawIntf, method) + tclosure := prog.Type(method.Type(), InGo) + i := iMethodOf(rawIntf, method.Name()) impl := intf.impl itab := Expr{b.faceItab(impl), prog.VoidPtrPtr()} pfn := b.Advance(itab, prog.IntVal(uint64(i+3), prog.Int())) - tclosure := prog.Type(method.Type(), InGo) return b.aggregateValue(tclosure, b.Load(pfn).impl, b.faceData(impl)) } diff --git a/ssa/package.go b/ssa/package.go index dd562f4b..8ac0d144 100644 --- a/ssa/package.go +++ b/ssa/package.go @@ -585,12 +585,24 @@ func (p Package) AfterInit(b Builder, ret BasicBlock) { b.SetBlockEx(ret, afterInit, false) if doAbiInit { sigAbiInit := types.NewSignatureType(nil, nil, nil, nil, nil, false) - fn := p.NewFunc(p.Path()+".init$abi", sigAbiInit, InC) - fnb := fn.MakeBody(1) - for _, abiInit := range p.abiini { - abiInit(unsafe.Pointer(fnb)) + baseName := p.Path() + ".init$abi" + name := baseName + idx := 1 + fn := p.NewFunc(name, sigAbiInit, InC) + for { + fnb := fn.MakeBody(1) + first := fnb.blk + p.callAbiInit(fnb) + fnb.Return() + if len(p.abiini) == 0 { + break + } + idx++ + name = baseName + strconv.Itoa(idx) + fn = p.NewFunc(name, sigAbiInit, InC) + fnb.SetBlockEx(first, AtStart, false) + fnb.Call(fn.Expr) } - fnb.Return() b.Call(fn.Expr) } if doPyLoadModSyms { @@ -599,6 +611,14 @@ func (p Package) AfterInit(b Builder, ret BasicBlock) { } } +func (p Package) callAbiInit(fnb Builder) { + abiini := p.abiini + p.abiini = nil + for _, abiInit := range abiini { + abiInit(unsafe.Pointer(fnb)) + } +} + /* type CodeGenFileType = llvm.CodeGenFileType diff --git a/ssa/type.go b/ssa/type.go index 6f8b2161..6d0228a5 100644 --- a/ssa/type.go +++ b/ssa/type.go @@ -417,4 +417,24 @@ func PathOf(pkg *types.Package) string { return abi.PathOf(pkg) } +// FuncName: +// - func: pkg.name +// - method: (pkg.T).name, (*pkg.T).name +func FuncName(pkg *types.Package, name string, recv *types.Var) string { + if recv != nil { + var tName string + t := recv.Type() + if tp, ok := t.(*types.Pointer); ok { + t, tName = tp.Elem(), "*" + } + tName += NameOf(t.(*types.Named)) + return "(" + tName + ")." + name + } + ret := FullName(pkg, name) + if ret == "main.main" { + ret = "main" + } + return ret +} + // ----------------------------------------------------------------------------- diff --git a/ssa/type_cvt.go b/ssa/type_cvt.go index aa578b5d..22ba6ea9 100644 --- a/ssa/type_cvt.go +++ b/ssa/type_cvt.go @@ -125,7 +125,14 @@ func (p goTypes) cvtNamed(t *types.Named) (raw *types.Named, cvt bool) { if named, ok := p.named[id]; ok { return named, false } - named := types.NewNamed(t.Obj(), types.Typ[types.Int], nil) + + n := t.NumMethods() + methods := make([]*types.Func, n) + for i := 0; i < n; i++ { + m := t.Method(i) // don't need to convert method signature + methods[i] = m + } + named := types.NewNamed(t.Obj(), types.Typ[types.Int], methods) p.named[id] = named defer delete(p.named, id) if tund, cvt := p.cvtType(t.Underlying()); cvt {