From e985eda857e20ac2858737a27f6a407915e00164 Mon Sep 17 00:00:00 2001 From: visualfc Date: Fri, 10 May 2024 13:25:36 +0800 Subject: [PATCH] typeAssert: bool float string --- cl/_testdata/print/in.go | 32 +- cl/_testdata/print/out.ll | 499 ++++++++++++++++++++---------- cl/compile.go | 8 - cl/import.go | 16 +- internal/runtime/llgo_autogen.lla | Bin 3862 -> 3727 bytes internal/runtime/z_iface.go | 32 +- ssa/expr.go | 59 ++-- ssa/type.go | 4 + 8 files changed, 412 insertions(+), 238 deletions(-) diff --git a/cl/_testdata/print/in.go b/cl/_testdata/print/in.go index 7b44b61b..24e32132 100644 --- a/cl/_testdata/print/in.go +++ b/cl/_testdata/print/in.go @@ -13,6 +13,14 @@ func gwrite(b []byte) { c.Printf(c.Str("%s"), b) } +func printbool(v bool) { + if v { + printstring("true") + } else { + printstring("false") + } +} + func printfloat(v float64) { switch { case v != v: @@ -177,14 +185,30 @@ func main() { printnl() prinfsub(100.1) printnl() - printnum(float32(1e9)) + printany(float32(1e9)) printnl() - printnum(float64(2e9)) + printany(float64(2e9)) + printnl() + println(true, false, 'a', 'A', rune('δΈ­'), + int8(1), int16(2), int32(3), int64(4), 5, + uint8(1), uint16(2), uint32(3), uint64(4), uintptr(5), + "llgo") +} + +func println(args ...any) { + for i, v := range args { + if i != 0 { + printstring(" ") + } + printany(v) + } printnl() } -func printnum(v any) { +func printany(v any) { switch v := v.(type) { + case bool: + printbool(v) case int: printint(int64(v)) case int8: @@ -211,6 +235,8 @@ func printnum(v any) { printfloat(float64(v)) case float64: printfloat(float64(v)) + case string: + printstring(v) } } diff --git a/cl/_testdata/print/out.ll b/cl/_testdata/print/out.ll index 73ea91b5..96074f94 100644 --- a/cl/_testdata/print/out.ll +++ b/cl/_testdata/print/out.ll @@ -13,13 +13,17 @@ source_filename = "main" @__llgo_argc = global ptr null @__llgo_argv = global ptr null @1 = private unnamed_addr constant [5 x i8] c"llgo\00", align 1 -@2 = private unnamed_addr constant [4 x i8] c"NaN\00", align 1 -@3 = private unnamed_addr constant [5 x i8] c"+Inf\00", align 1 -@4 = private unnamed_addr constant [5 x i8] c"-Inf\00", align 1 -@5 = private unnamed_addr constant [17 x i8] c"0123456789abcdef\00", align 1 -@6 = private unnamed_addr constant [2 x i8] c"-\00", align 1 -@7 = private unnamed_addr constant [2 x i8] c"\0A\00", align 1 -@8 = private unnamed_addr constant [2 x i8] c" \00", align 1 +@2 = private unnamed_addr constant [5 x i8] c"llgo\00", align 1 +@3 = private unnamed_addr constant [5 x i8] c"true\00", align 1 +@4 = private unnamed_addr constant [6 x i8] c"false\00", align 1 +@5 = private unnamed_addr constant [4 x i8] c"NaN\00", align 1 +@6 = private unnamed_addr constant [5 x i8] c"+Inf\00", align 1 +@7 = private unnamed_addr constant [5 x i8] c"-Inf\00", align 1 +@8 = private unnamed_addr constant [17 x i8] c"0123456789abcdef\00", align 1 +@9 = private unnamed_addr constant [2 x i8] c"-\00", align 1 +@10 = private unnamed_addr constant [2 x i8] c" \00", align 1 +@11 = private unnamed_addr constant [2 x i8] c"\0A\00", align 1 +@12 = private unnamed_addr constant [2 x i8] c" \00", align 1 define %"github.com/goplus/llgo/internal/runtime.Slice" @main.bytes(%"github.com/goplus/llgo/internal/runtime.String" %0) { _llgo_0: @@ -94,12 +98,79 @@ _llgo_0: call void @main.printnl() %3 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 13) %4 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %3, i64 1315859240) - call void @main.printnum(%"github.com/goplus/llgo/internal/runtime.iface" %4) + call void @main.printany(%"github.com/goplus/llgo/internal/runtime.iface" %4) call void @main.printnl() %5 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 14) %6 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %5, i64 4746175415993761792) - call void @main.printnum(%"github.com/goplus/llgo/internal/runtime.iface" %6) + call void @main.printany(%"github.com/goplus/llgo/internal/runtime.iface" %6) call void @main.printnl() + %7 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 256) + %8 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 0 + %9 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 1) + %10 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %9, i64 -1) + store %"github.com/goplus/llgo/internal/runtime.iface" %10, ptr %8, align 8 + %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 1 + %12 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 1) + %13 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %12, i64 0) + store %"github.com/goplus/llgo/internal/runtime.iface" %13, ptr %11, align 8 + %14 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 2 + %15 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 5) + %16 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %15, i64 97) + store %"github.com/goplus/llgo/internal/runtime.iface" %16, ptr %14, align 8 + %17 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 3 + %18 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 5) + %19 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %18, i64 65) + store %"github.com/goplus/llgo/internal/runtime.iface" %19, ptr %17, align 8 + %20 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 4 + %21 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 5) + %22 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %21, i64 20013) + store %"github.com/goplus/llgo/internal/runtime.iface" %22, ptr %20, align 8 + %23 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 5 + %24 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 3) + %25 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %24, i64 1) + store %"github.com/goplus/llgo/internal/runtime.iface" %25, ptr %23, align 8 + %26 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 6 + %27 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 4) + %28 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %27, i64 2) + store %"github.com/goplus/llgo/internal/runtime.iface" %28, ptr %26, align 8 + %29 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 7 + %30 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 5) + %31 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %30, i64 3) + store %"github.com/goplus/llgo/internal/runtime.iface" %31, ptr %29, align 8 + %32 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 8 + %33 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 6) + %34 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %33, i64 4) + store %"github.com/goplus/llgo/internal/runtime.iface" %34, ptr %32, align 8 + %35 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 9 + %36 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) + %37 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %36, i64 5) + store %"github.com/goplus/llgo/internal/runtime.iface" %37, ptr %35, align 8 + %38 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 10 + %39 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 8) + %40 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %39, i64 1) + store %"github.com/goplus/llgo/internal/runtime.iface" %40, ptr %38, align 8 + %41 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 11 + %42 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 9) + %43 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %42, i64 2) + store %"github.com/goplus/llgo/internal/runtime.iface" %43, ptr %41, align 8 + %44 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 12 + %45 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 10) + %46 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %45, i64 3) + store %"github.com/goplus/llgo/internal/runtime.iface" %46, ptr %44, align 8 + %47 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 13 + %48 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 11) + %49 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %48, i64 4) + store %"github.com/goplus/llgo/internal/runtime.iface" %49, ptr %47, align 8 + %50 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 14 + %51 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 12) + %52 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr %51, i64 5) + store %"github.com/goplus/llgo/internal/runtime.iface" %52, ptr %50, align 8 + %53 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %7, i64 15 + %54 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @2, i64 4) + %55 = call %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyString"(%"github.com/goplus/llgo/internal/runtime.String" %54) + store %"github.com/goplus/llgo/internal/runtime.iface" %55, ptr %53, align 8 + %56 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %7, i64 16, i64 16, i64 0, i64 16, i64 16) + call void @main.println(%"github.com/goplus/llgo/internal/runtime.Slice" %56) ret void } @@ -117,18 +188,223 @@ _llgo_0: ret void } +define void @main.printany(%"github.com/goplus/llgo/internal/runtime.iface" %0) { +_llgo_0: + %1 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 1) + %2 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %1) + %3 = extractvalue { i64, i1 } %2, 0 + %4 = trunc i64 %3 to i1 + %5 = extractvalue { i64, i1 } %2, 1 + br i1 %5, label %_llgo_2, label %_llgo_3 + +_llgo_1: ; preds = %_llgo_30, %_llgo_29, %_llgo_28, %_llgo_26, %_llgo_24, %_llgo_22, %_llgo_20, %_llgo_18, %_llgo_16, %_llgo_14, %_llgo_12, %_llgo_10, %_llgo_8, %_llgo_6, %_llgo_4, %_llgo_2 + ret void + +_llgo_2: ; preds = %_llgo_0 + call void @main.printbool(i1 %4) + br label %_llgo_1 + +_llgo_3: ; preds = %_llgo_0 + %6 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) + %7 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %6) + %8 = extractvalue { i64, i1 } %7, 0 + %9 = extractvalue { i64, i1 } %7, 1 + br i1 %9, label %_llgo_4, label %_llgo_5 + +_llgo_4: ; preds = %_llgo_3 + call void @main.printint(i64 %8) + br label %_llgo_1 + +_llgo_5: ; preds = %_llgo_3 + %10 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 3) + %11 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %10) + %12 = extractvalue { i64, i1 } %11, 0 + %13 = trunc i64 %12 to i8 + %14 = extractvalue { i64, i1 } %11, 1 + br i1 %14, label %_llgo_6, label %_llgo_7 + +_llgo_6: ; preds = %_llgo_5 + %15 = sext i8 %13 to i64 + call void @main.printint(i64 %15) + br label %_llgo_1 + +_llgo_7: ; preds = %_llgo_5 + %16 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 4) + %17 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %16) + %18 = extractvalue { i64, i1 } %17, 0 + %19 = trunc i64 %18 to i16 + %20 = extractvalue { i64, i1 } %17, 1 + br i1 %20, label %_llgo_8, label %_llgo_9 + +_llgo_8: ; preds = %_llgo_7 + %21 = sext i16 %19 to i64 + call void @main.printint(i64 %21) + br label %_llgo_1 + +_llgo_9: ; preds = %_llgo_7 + %22 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 5) + %23 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %22) + %24 = extractvalue { i64, i1 } %23, 0 + %25 = trunc i64 %24 to i32 + %26 = extractvalue { i64, i1 } %23, 1 + br i1 %26, label %_llgo_10, label %_llgo_11 + +_llgo_10: ; preds = %_llgo_9 + %27 = sext i32 %25 to i64 + call void @main.printint(i64 %27) + br label %_llgo_1 + +_llgo_11: ; preds = %_llgo_9 + %28 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 6) + %29 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %28) + %30 = extractvalue { i64, i1 } %29, 0 + %31 = extractvalue { i64, i1 } %29, 1 + br i1 %31, label %_llgo_12, label %_llgo_13 + +_llgo_12: ; preds = %_llgo_11 + call void @main.printint(i64 %30) + br label %_llgo_1 + +_llgo_13: ; preds = %_llgo_11 + %32 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 7) + %33 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %32) + %34 = extractvalue { i64, i1 } %33, 0 + %35 = extractvalue { i64, i1 } %33, 1 + br i1 %35, label %_llgo_14, label %_llgo_15 + +_llgo_14: ; preds = %_llgo_13 + call void @main.printuint(i64 %34) + br label %_llgo_1 + +_llgo_15: ; preds = %_llgo_13 + %36 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 8) + %37 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %36) + %38 = extractvalue { i64, i1 } %37, 0 + %39 = trunc i64 %38 to i8 + %40 = extractvalue { i64, i1 } %37, 1 + br i1 %40, label %_llgo_16, label %_llgo_17 + +_llgo_16: ; preds = %_llgo_15 + %41 = sext i8 %39 to i64 + call void @main.printuint(i64 %41) + br label %_llgo_1 + +_llgo_17: ; preds = %_llgo_15 + %42 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 9) + %43 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %42) + %44 = extractvalue { i64, i1 } %43, 0 + %45 = trunc i64 %44 to i16 + %46 = extractvalue { i64, i1 } %43, 1 + br i1 %46, label %_llgo_18, label %_llgo_19 + +_llgo_18: ; preds = %_llgo_17 + %47 = sext i16 %45 to i64 + call void @main.printuint(i64 %47) + br label %_llgo_1 + +_llgo_19: ; preds = %_llgo_17 + %48 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 10) + %49 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %48) + %50 = extractvalue { i64, i1 } %49, 0 + %51 = trunc i64 %50 to i32 + %52 = extractvalue { i64, i1 } %49, 1 + br i1 %52, label %_llgo_20, label %_llgo_21 + +_llgo_20: ; preds = %_llgo_19 + %53 = sext i32 %51 to i64 + call void @main.printuint(i64 %53) + br label %_llgo_1 + +_llgo_21: ; preds = %_llgo_19 + %54 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 11) + %55 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %54) + %56 = extractvalue { i64, i1 } %55, 0 + %57 = extractvalue { i64, i1 } %55, 1 + br i1 %57, label %_llgo_22, label %_llgo_23 + +_llgo_22: ; preds = %_llgo_21 + call void @main.printuint(i64 %56) + br label %_llgo_1 + +_llgo_23: ; preds = %_llgo_21 + %58 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 12) + %59 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %58) + %60 = extractvalue { i64, i1 } %59, 0 + %61 = extractvalue { i64, i1 } %59, 1 + br i1 %61, label %_llgo_24, label %_llgo_25 + +_llgo_24: ; preds = %_llgo_23 + call void @main.printuint(i64 %60) + br label %_llgo_1 + +_llgo_25: ; preds = %_llgo_23 + %62 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 13) + %63 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %62) + %64 = extractvalue { i64, i1 } %63, 0 + %65 = trunc i64 %64 to i32 + %66 = bitcast i32 %65 to float + %67 = extractvalue { i64, i1 } %63, 1 + br i1 %67, label %_llgo_26, label %_llgo_27 + +_llgo_26: ; preds = %_llgo_25 + %68 = fpext float %66 to double + call void @main.printfloat(double %68) + br label %_llgo_1 + +_llgo_27: ; preds = %_llgo_25 + %69 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 14) + %70 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %69) + %71 = extractvalue { i64, i1 } %70, 0 + %72 = bitcast i64 %71 to double + %73 = extractvalue { i64, i1 } %70, 1 + br i1 %73, label %_llgo_28, label %_llgo_29 + +_llgo_28: ; preds = %_llgo_27 + call void @main.printfloat(double %72) + br label %_llgo_1 + +_llgo_29: ; preds = %_llgo_27 + %74 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 24) + %75 = call { %"github.com/goplus/llgo/internal/runtime.String", i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2String"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %74) + %76 = extractvalue { %"github.com/goplus/llgo/internal/runtime.String", i1 } %75, 0 + %77 = extractvalue { %"github.com/goplus/llgo/internal/runtime.String", i1 } %75, 1 + br i1 %77, label %_llgo_30, label %_llgo_1 + +_llgo_30: ; preds = %_llgo_29 + call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %76) + br label %_llgo_1 +} + +define void @main.printbool(i1 %0) { +_llgo_0: + br i1 %0, label %_llgo_1, label %_llgo_3 + +_llgo_1: ; preds = %_llgo_0 + %1 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @3, i64 4) + call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %1) + br label %_llgo_2 + +_llgo_2: ; preds = %_llgo_3, %_llgo_1 + ret void + +_llgo_3: ; preds = %_llgo_0 + %2 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @4, i64 5) + call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %2) + br label %_llgo_2 +} + define void @main.printfloat(double %0) { _llgo_0: %1 = fcmp one double %0, %0 br i1 %1, label %_llgo_1, label %_llgo_3 _llgo_1: ; preds = %_llgo_0 - %2 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @2, i64 3) + %2 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @5, i64 3) call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %2) ret void _llgo_2: ; preds = %_llgo_7 - %3 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @3, i64 4) + %3 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @6, i64 4) call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %3) ret void @@ -138,7 +414,7 @@ _llgo_3: ; preds = %_llgo_0 br i1 %5, label %_llgo_6, label %_llgo_7 _llgo_4: ; preds = %_llgo_10 - %6 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @4, i64 4) + %6 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @7, i64 4) call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %6) ret void @@ -310,7 +586,7 @@ _llgo_0: _llgo_1: ; preds = %_llgo_3 %2 = urem i64 %14, 16 - %3 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @5, i64 16) + %3 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @8, i64 16) %4 = call ptr @"github.com/goplus/llgo/internal/runtime.StringData"(%"github.com/goplus/llgo/internal/runtime.String" %3) %5 = getelementptr inbounds i8, ptr %4, i64 %2 %6 = load i8, ptr %5, align 1 @@ -354,7 +630,7 @@ _llgo_0: br i1 %1, label %_llgo_1, label %_llgo_2 _llgo_1: ; preds = %_llgo_0 - %2 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @6, i64 1) + %2 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @9, i64 1) call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %2) %3 = sub i64 0, %0 br label %_llgo_2 @@ -365,165 +641,48 @@ _llgo_2: ; preds = %_llgo_1, %_llgo_0 ret void } +define void @main.println(%"github.com/goplus/llgo/internal/runtime.Slice" %0) { +_llgo_0: + %1 = call i64 @"github.com/goplus/llgo/internal/runtime.SliceLen"(%"github.com/goplus/llgo/internal/runtime.Slice" %0) + br label %_llgo_1 + +_llgo_1: ; preds = %_llgo_5, %_llgo_0 + %2 = phi i64 [ -1, %_llgo_0 ], [ %3, %_llgo_5 ] + %3 = add i64 %2, 1 + %4 = icmp slt i64 %3, %1 + br i1 %4, label %_llgo_2, label %_llgo_3 + +_llgo_2: ; preds = %_llgo_1 + %5 = call ptr @"github.com/goplus/llgo/internal/runtime.SliceData"(%"github.com/goplus/llgo/internal/runtime.Slice" %0) + %6 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.iface", ptr %5, i64 %3 + %7 = load %"github.com/goplus/llgo/internal/runtime.iface", ptr %6, align 8 + %8 = icmp ne i64 %3, 0 + br i1 %8, label %_llgo_4, label %_llgo_5 + +_llgo_3: ; preds = %_llgo_1 + call void @main.printnl() + ret void + +_llgo_4: ; preds = %_llgo_2 + %9 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @10, i64 1) + call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %9) + br label %_llgo_5 + +_llgo_5: ; preds = %_llgo_4, %_llgo_2 + call void @main.printany(%"github.com/goplus/llgo/internal/runtime.iface" %7) + br label %_llgo_1 +} + define void @main.printnl() { _llgo_0: - %0 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @7, i64 1) + %0 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @11, i64 1) call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %0) ret void } -define void @main.printnum(%"github.com/goplus/llgo/internal/runtime.iface" %0) { -_llgo_0: - %1 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) - %2 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %1) - %3 = extractvalue { i64, i1 } %2, 0 - %4 = extractvalue { i64, i1 } %2, 1 - br i1 %4, label %_llgo_2, label %_llgo_3 - -_llgo_1: ; preds = %_llgo_26, %_llgo_25, %_llgo_24, %_llgo_22, %_llgo_20, %_llgo_18, %_llgo_16, %_llgo_14, %_llgo_12, %_llgo_10, %_llgo_8, %_llgo_6, %_llgo_4, %_llgo_2 - ret void - -_llgo_2: ; preds = %_llgo_0 - call void @main.printint(i64 %3) - br label %_llgo_1 - -_llgo_3: ; preds = %_llgo_0 - %5 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 3) - %6 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %5) - %7 = extractvalue { i64, i1 } %6, 0 - %8 = extractvalue { i64, i1 } %6, 1 - br i1 %8, label %_llgo_4, label %_llgo_5 - -_llgo_4: ; preds = %_llgo_3 - call void @main.printint(i64 %7) - br label %_llgo_1 - -_llgo_5: ; preds = %_llgo_3 - %9 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 4) - %10 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %9) - %11 = extractvalue { i64, i1 } %10, 0 - %12 = extractvalue { i64, i1 } %10, 1 - br i1 %12, label %_llgo_6, label %_llgo_7 - -_llgo_6: ; preds = %_llgo_5 - call void @main.printint(i64 %11) - br label %_llgo_1 - -_llgo_7: ; preds = %_llgo_5 - %13 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 5) - %14 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %13) - %15 = extractvalue { i64, i1 } %14, 0 - %16 = extractvalue { i64, i1 } %14, 1 - br i1 %16, label %_llgo_8, label %_llgo_9 - -_llgo_8: ; preds = %_llgo_7 - call void @main.printint(i64 %15) - br label %_llgo_1 - -_llgo_9: ; preds = %_llgo_7 - %17 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 6) - %18 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %17) - %19 = extractvalue { i64, i1 } %18, 0 - %20 = extractvalue { i64, i1 } %18, 1 - br i1 %20, label %_llgo_10, label %_llgo_11 - -_llgo_10: ; preds = %_llgo_9 - call void @main.printint(i64 %19) - br label %_llgo_1 - -_llgo_11: ; preds = %_llgo_9 - %21 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 7) - %22 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %21) - %23 = extractvalue { i64, i1 } %22, 0 - %24 = extractvalue { i64, i1 } %22, 1 - br i1 %24, label %_llgo_12, label %_llgo_13 - -_llgo_12: ; preds = %_llgo_11 - call void @main.printuint(i64 %23) - br label %_llgo_1 - -_llgo_13: ; preds = %_llgo_11 - %25 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 8) - %26 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %25) - %27 = extractvalue { i64, i1 } %26, 0 - %28 = extractvalue { i64, i1 } %26, 1 - br i1 %28, label %_llgo_14, label %_llgo_15 - -_llgo_14: ; preds = %_llgo_13 - call void @main.printuint(i64 %27) - br label %_llgo_1 - -_llgo_15: ; preds = %_llgo_13 - %29 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 9) - %30 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %29) - %31 = extractvalue { i64, i1 } %30, 0 - %32 = extractvalue { i64, i1 } %30, 1 - br i1 %32, label %_llgo_16, label %_llgo_17 - -_llgo_16: ; preds = %_llgo_15 - call void @main.printuint(i64 %31) - br label %_llgo_1 - -_llgo_17: ; preds = %_llgo_15 - %33 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 10) - %34 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %33) - %35 = extractvalue { i64, i1 } %34, 0 - %36 = extractvalue { i64, i1 } %34, 1 - br i1 %36, label %_llgo_18, label %_llgo_19 - -_llgo_18: ; preds = %_llgo_17 - call void @main.printuint(i64 %35) - br label %_llgo_1 - -_llgo_19: ; preds = %_llgo_17 - %37 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 11) - %38 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %37) - %39 = extractvalue { i64, i1 } %38, 0 - %40 = extractvalue { i64, i1 } %38, 1 - br i1 %40, label %_llgo_20, label %_llgo_21 - -_llgo_20: ; preds = %_llgo_19 - call void @main.printuint(i64 %39) - br label %_llgo_1 - -_llgo_21: ; preds = %_llgo_19 - %41 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 12) - %42 = call { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %41) - %43 = extractvalue { i64, i1 } %42, 0 - %44 = extractvalue { i64, i1 } %42, 1 - br i1 %44, label %_llgo_22, label %_llgo_23 - -_llgo_22: ; preds = %_llgo_21 - call void @main.printuint(i64 %43) - br label %_llgo_1 - -_llgo_23: ; preds = %_llgo_21 - %45 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 13) - %46 = call { float, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Float32"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %45) - %47 = extractvalue { float, i1 } %46, 0 - %48 = extractvalue { float, i1 } %46, 1 - br i1 %48, label %_llgo_24, label %_llgo_25 - -_llgo_24: ; preds = %_llgo_23 - %49 = fpext float %47 to double - call void @main.printfloat(double %49) - br label %_llgo_1 - -_llgo_25: ; preds = %_llgo_23 - %50 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 14) - %51 = call { double, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Float64"(%"github.com/goplus/llgo/internal/runtime.iface" %0, ptr %50) - %52 = extractvalue { double, i1 } %51, 0 - %53 = extractvalue { double, i1 } %51, 1 - br i1 %53, label %_llgo_26, label %_llgo_1 - -_llgo_26: ; preds = %_llgo_25 - call void @main.printfloat(double %52) - br label %_llgo_1 -} - define void @main.printsp() { _llgo_0: - %0 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @8, i64 1) + %0 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.NewString"(ptr @12, i64 1) call void @main.printstring(%"github.com/goplus/llgo/internal/runtime.String" %0) ret void } @@ -599,12 +758,14 @@ declare ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64) declare %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyInt"(ptr, i64) -declare %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr, i64, i64, i64, i64, i64) +declare %"github.com/goplus/llgo/internal/runtime.iface" @"github.com/goplus/llgo/internal/runtime.MakeAnyString"(%"github.com/goplus/llgo/internal/runtime.String") -declare ptr @"github.com/goplus/llgo/internal/runtime.StringData"(%"github.com/goplus/llgo/internal/runtime.String") +declare %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr, i64, i64, i64, i64, i64) declare { i64, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Int"(%"github.com/goplus/llgo/internal/runtime.iface", ptr) -declare { float, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Float32"(%"github.com/goplus/llgo/internal/runtime.iface", ptr) +declare { %"github.com/goplus/llgo/internal/runtime.String", i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2String"(%"github.com/goplus/llgo/internal/runtime.iface", ptr) -declare { double, i1 } @"github.com/goplus/llgo/internal/runtime.CheckI2Float64"(%"github.com/goplus/llgo/internal/runtime.iface", ptr) +declare ptr @"github.com/goplus/llgo/internal/runtime.StringData"(%"github.com/goplus/llgo/internal/runtime.String") + +declare ptr @"github.com/goplus/llgo/internal/runtime.SliceData"(%"github.com/goplus/llgo/internal/runtime.Slice") diff --git a/cl/compile.go b/cl/compile.go index aedc0b01..62b4fc0c 100644 --- a/cl/compile.go +++ b/cl/compile.go @@ -290,10 +290,6 @@ func (p *context) funcOf(fn *ssa.Function) (ret llssa.Function, ftype int) { ftype = llgoAllocaCStr case "unreachable": ftype = llgoUnreachable - case "bitCastTo64F": - ftype = llgoBitCastTo64F - case "bitCastTo32F": - ftype = llgoBitCastTo32F default: panic("unknown llgo instruction: " + name) } @@ -527,10 +523,6 @@ func (p *context) compileInstrOrValue(b llssa.Builder, iv instrOrValue, asValue ret = p.allocaCStr(b, args) case llgoUnreachable: // func unreachable() b.Unreachable() - case llgoBitCastTo32F: - ret = b.BitCast(p.compileValue(b, args[0]), b.Prog.Type(types.Typ[types.Float32], llssa.InGo)) - case llgoBitCastTo64F: - ret = b.BitCast(p.compileValue(b, args[0]), b.Prog.Float64()) default: panic("todo") } diff --git a/cl/import.go b/cl/import.go index 5e2b23e7..3f3e08ae 100644 --- a/cl/import.go +++ b/cl/import.go @@ -305,15 +305,13 @@ const ( cFunc = int(llssa.InC) llgoInstr = -1 - llgoInstrBase = 0x80 - llgoUnreachable = llgoInstrBase + 0 - llgoCstr = llgoInstrBase + 1 - llgoAlloca = llgoInstrBase + 2 - llgoAllocaCStr = llgoInstrBase + 3 - llgoAdvance = llgoInstrBase + 4 - llgoIndex = llgoInstrBase + 5 - llgoBitCastTo32F = llgoInstrBase + 6 - llgoBitCastTo64F = llgoInstrBase + 7 + llgoInstrBase = 0x80 + llgoUnreachable = llgoInstrBase + 0 + llgoCstr = llgoInstrBase + 1 + llgoAlloca = llgoInstrBase + 2 + llgoAllocaCStr = llgoInstrBase + 3 + llgoAdvance = llgoInstrBase + 4 + llgoIndex = llgoInstrBase + 5 ) func (p *context) funcName(fn *ssa.Function, ignore bool) (*types.Package, string, int) { diff --git a/internal/runtime/llgo_autogen.lla b/internal/runtime/llgo_autogen.lla index 1bb3e9d8214b7618268901704b9c95ed1f7ebba4..9620de0b1264a0fb211488082c66ebf6d70b27b5 100644 GIT binary patch delta 3674 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
3(l07%uIA6Z8cS-T7oB~Nt@oj{KBonO& z6zgoNN6oWHiexj>(cGl=@BgB24Y}kl_pKSe5e6-MX%e=4>!lf6U>{Z*e}}#OdK=RE zZ4Ziim0qO}{9>58@wX+>+x3RLmoYMuLecq0i$@{)%DKM2zI1LLHs!aA2X!C+%H!wZ zagoKfIk;KjwM0O1DSkrB9PpmurB-~WF2JrC;=f~%sHD%bFvb5PGhJpGCjSFaO928N s0~7!N00;m^YN}XW5It4f1q}cI5uB674k!Z@u050R4j=|34gdfE0BOGtY5)KL delta 3810 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 YFQk(`4k!cNe>{_E4j=}r4gdfE08=t@lmGw# diff --git a/internal/runtime/z_iface.go b/internal/runtime/z_iface.go index 2c4a1e8d..e8d8c747 100644 --- a/internal/runtime/z_iface.go +++ b/internal/runtime/z_iface.go @@ -77,38 +77,18 @@ func CheckI2Int(v Interface, t *Type) (uintptr, bool) { return 0, false } -func I2Float64(v Interface, t *Type) float64 { +func I2String(v Interface, t *Type) string { if v.tab._type == t { - return bitCastTo64F(uint64(uintptr(v.data))) + return *(*string)(v.data) } - panic("I2Float64: type mismatch") + panic("I2String: type mismatch") } -func CheckI2Float64(v Interface, t *Type) (float64, bool) { +func CheckI2String(v Interface, t *Type) (string, bool) { if v.tab._type == t { - return bitCastTo64F(uint64(uintptr(v.data))), true + return *(*string)(v.data), true } - return 0, false + return "", false } -func I2Float32(v Interface, t *Type) float32 { - if v.tab._type == t { - return bitCastTo32F(uint32(uintptr(v.data))) - } - panic("I2Float32: type mismatch") -} - -func CheckI2Float32(v Interface, t *Type) (float32, bool) { - if v.tab._type == t { - return bitCastTo32F(uint32(uintptr(v.data))), true - } - return 0, false -} - -//go:linkname bitCastTo64F llgo.bitCastTo64F -func bitCastTo64F(uint64) float64 - -//go:linkname bitCastTo32F llgo.bitCastTo32F -func bitCastTo32F(uint32) float32 - // ----------------------------------------------------------------------------- diff --git a/ssa/expr.go b/ssa/expr.go index 7d2715d6..c0473637 100644 --- a/ssa/expr.go +++ b/ssa/expr.go @@ -24,6 +24,7 @@ import ( "go/types" "log" + "github.com/goplus/llgo/internal/abi" "github.com/goplus/llvm" ) @@ -1051,7 +1052,7 @@ func (b Builder) MakeInterface(tinter Type, x Expr) (ret Expr) { case *types.Basic: kind := tx.Kind() switch { - case kind >= types.Int && kind <= types.Uintptr: + case kind >= types.Bool && kind <= types.Uintptr: t := b.InlineCall(pkg.rtFunc("Basic"), prog.Val(int(kind))) tptr := prog.Uintptr() vptr := Expr{llvm.CreateIntCast(b.impl, x.impl, tptr.ll), tptr} @@ -1118,7 +1119,7 @@ func (b Builder) TypeAssert(x Expr, assertedTyp Type, commaOk bool) (ret Expr) { log.Printf("TypeAssert %v, %v, %v\n", x.impl, assertedTyp.raw.Type, commaOk) } switch assertedTyp.kind { - case vkSigned, vkUnsigned: + case vkSigned, vkUnsigned, vkFloat, vkBool: pkg := b.Func.Pkg fnName := "I2Int" if commaOk { @@ -1133,25 +1134,44 @@ func (b Builder) TypeAssert(x Expr, assertedTyp Type, commaOk bool) (ret Expr) { panic("todo") } typ := b.InlineCall(pkg.rtFunc("Basic"), b.Prog.Val(int(kind))) - return b.InlineCall(fn, x, typ) - case vkFloat: - var fnName string - kind := assertedTyp.raw.Underlying().(*types.Basic).Kind() - switch kind { - case types.Float32: - fnName = "I2Float32" - if commaOk { - fnName = "CheckI2Float32" + ret = b.InlineCall(fn, x, typ) + if kind != types.Uintptr { + conv := func(v llvm.Value) llvm.Value { + switch kind { + case types.Float32: + v = castInt(b.impl, v, b.Prog.tyInt32()) + v = b.impl.CreateBitCast(v, assertedTyp.ll, "") + case types.Float64: + v = b.impl.CreateBitCast(v, assertedTyp.ll, "") + default: + v = castInt(b.impl, v, assertedTyp.ll) + } + return v } - case types.Float64: - fnName = "I2Float64" - if commaOk { - fnName = "CheckI2Float64" + if !commaOk { + ret.Type = assertedTyp + ret.impl = conv(ret.impl) + } else { + ret.Type = b.Prog.toTuple( + types.NewTuple( + types.NewVar(token.NoPos, nil, "", assertedTyp.RawType()), + ret.Type.RawType().(*types.Tuple).At(1), + ), + ) + val0 := conv(b.impl.CreateExtractValue(ret.impl, 0, "")) + val1 := b.impl.CreateExtractValue(ret.impl, 1, "") + ret.impl = llvm.ConstStruct([]llvm.Value{val0, val1}, false) } } + return + case vkString: pkg := b.Func.Pkg + fnName := "I2String" + if commaOk { + fnName = "CheckI2String" + } fn := pkg.rtFunc(fnName) - typ := b.InlineCall(pkg.rtFunc("Basic"), b.Prog.Val(int(kind))) + typ := b.InlineCall(pkg.rtFunc("Basic"), b.Prog.Val(int(abi.String))) return b.InlineCall(fn, x, typ) } panic("todo") @@ -1262,11 +1282,4 @@ func (b Builder) BuiltinCall(fn string, args ...Expr) (ret Expr) { panic("todo") } -// BitCast bit cast expr to type -func (b Builder) BitCast(val Expr, typ Type) (ret Expr) { - ret.Type = typ - ret.impl = b.impl.CreateBitCast(val.impl, typ.ll, "") - return -} - // ----------------------------------------------------------------------------- diff --git a/ssa/type.go b/ssa/type.go index aecad47d..6ec4c0a0 100644 --- a/ssa/type.go +++ b/ssa/type.go @@ -188,6 +188,10 @@ func (p Program) tyInt64() llvm.Type { return p.int64Type } +func (p Program) toTuple(typ *types.Tuple) Type { + return &aType{p.toLLVMTuple(typ), rawType{typ}, vkTuple} +} + func (p Program) toType(raw types.Type) Type { typ := rawType{raw} switch t := raw.(type) {