From 2e491614159c2d8da9e7511a07ab69ff60cbce88 Mon Sep 17 00:00:00 2001 From: visualfc Date: Wed, 29 May 2024 12:34:06 +0800 Subject: [PATCH] ssa: fix slice type from *array --- cl/_testgo/eface/in.go | 10 +- cl/_testgo/eface/out.ll | 237 +++++++++++++++++++++++--------------- cl/_testrt/builtin/out.ll | 16 +-- ssa/datastruct.go | 3 +- 4 files changed, 163 insertions(+), 103 deletions(-) diff --git a/cl/_testgo/eface/in.go b/cl/_testgo/eface/in.go index 2595e1275..4f13ae5be 100644 --- a/cl/_testgo/eface/in.go +++ b/cl/_testgo/eface/in.go @@ -40,5 +40,13 @@ func main() { func dump(v any) { e := (*eface)(unsafe.Pointer(&v)) - println(e._type.Size(), e._type.Kind(), e._type, e._type.Elem()) + dumpTyp(e._type, "") +} + +func dumpTyp(t *abi.Type, sep string) { + print(sep) + println(t.Kind(), t.Size_, t.PtrBytes, t.Hash, t.TFlag, t.Align_, t.Str_, t.PtrToThis_) + if t.Elem() != nil { + dumpTyp(t.Elem(), sep+"\t") + } } diff --git a/cl/_testgo/eface/out.ll b/cl/_testgo/eface/out.ll index ebe5091ef..ff8f5bc4a 100644 --- a/cl/_testgo/eface/out.ll +++ b/cl/_testgo/eface/out.ll @@ -3,26 +3,29 @@ source_filename = "main" %"github.com/goplus/llgo/internal/runtime.eface" = type { ptr, ptr } %main.eface = type { ptr, ptr } -%"github.com/goplus/llgo/internal/runtime.Slice" = type { ptr, i64, i64 } %"github.com/goplus/llgo/internal/runtime.String" = type { ptr, i64 } +%"github.com/goplus/llgo/internal/abi.Type" = type { i64, i64, i32, i8, i8, i8, i8, { ptr, ptr }, ptr, %"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.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 +@0 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@1 = private unnamed_addr constant [2 x i8] c"\09\00", align 1 @__llgo_argc = global ptr null @__llgo_argv = global ptr null @"[10]_llgo_int" = linkonce global ptr null @"_llgo_func$2_iS07vIlF2_rZqWB5eU0IvP_9HviM4MYZNkXZDvbac" = linkonce global ptr null @"*_llgo_int" = linkonce global ptr null -@"[][0]_llgo_int" = linkonce global ptr null -@0 = private unnamed_addr constant [6 x i8] c"hello\00", align 1 +@"[]_llgo_int" = linkonce global ptr null +@2 = private unnamed_addr constant [6 x i8] c"hello\00", align 1 @"main.struct$RKbUG45GE4henGMAdmt0Rju0JptyR8NsX7IZLsOI0OM" = global ptr null -@1 = private unnamed_addr constant [2 x i8] c"x\00", align 1 -@2 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@3 = private unnamed_addr constant [2 x i8] c"y\00", align 1 +@3 = private unnamed_addr constant [2 x i8] c"x\00", align 1 @4 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@5 = private unnamed_addr constant [2 x i8] c"z\00", align 1 +@5 = private unnamed_addr constant [2 x i8] c"y\00", align 1 @6 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 -@7 = private unnamed_addr constant [5 x i8] c"main\00", align 1 +@7 = private unnamed_addr constant [2 x i8] c"z\00", align 1 +@8 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1 +@9 = private unnamed_addr constant [5 x i8] c"main\00", align 1 define void @main.dump(%"github.com/goplus/llgo/internal/runtime.eface" %0) { _llgo_0: @@ -30,23 +33,70 @@ _llgo_0: store %"github.com/goplus/llgo/internal/runtime.eface" %0, ptr %1, align 8 %2 = getelementptr inbounds %main.eface, ptr %1, i32 0, i32 0 %3 = load ptr, ptr %2, align 8 - %4 = call i64 @"(*github.com/goplus/llgo/internal/abi.Type).Size"(ptr %3) - %5 = getelementptr inbounds %main.eface, ptr %1, i32 0, i32 0 - %6 = load ptr, ptr %5, align 8 - %7 = call i64 @"(*github.com/goplus/llgo/internal/abi.Type).Kind"(ptr %6) - %8 = getelementptr inbounds %main.eface, ptr %1, i32 0, i32 0 - %9 = load ptr, ptr %8, align 8 - %10 = getelementptr inbounds %main.eface, ptr %1, i32 0, i32 0 - %11 = load ptr, ptr %10, align 8 - %12 = call ptr @"(*github.com/goplus/llgo/internal/abi.Type).Elem"(ptr %11) + %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 @0, ptr %5, align 8 + %6 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %4, i32 0, i32 1 + store i64 0, ptr %6, align 4 + %7 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %4, align 8 + call void @main.dumpTyp(ptr %3, %"github.com/goplus/llgo/internal/runtime.String" %7) + ret void +} + +define void @main.dumpTyp(ptr %0, %"github.com/goplus/llgo/internal/runtime.String" %1) { +_llgo_0: + call void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String" %1) + %2 = call i64 @"(*github.com/goplus/llgo/internal/abi.Type).Kind"(ptr %0) + %3 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 0 + %4 = load i64, ptr %3, align 4 + %5 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 1 + %6 = load i64, ptr %5, align 4 + %7 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 2 + %8 = load i32, ptr %7, align 4 + %9 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 3 + %10 = load i8, ptr %9, align 1 + %11 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 4 + %12 = load i8, ptr %11, align 1 + %13 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 9 + %14 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %13, align 8 + %15 = getelementptr inbounds %"github.com/goplus/llgo/internal/abi.Type", ptr %0, i32 0, i32 10 + %16 = load ptr, ptr %15, align 8 + call void @"github.com/goplus/llgo/internal/runtime.PrintUint"(i64 %2) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32) call void @"github.com/goplus/llgo/internal/runtime.PrintUint"(i64 %4) call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32) - call void @"github.com/goplus/llgo/internal/runtime.PrintUint"(i64 %7) + call void @"github.com/goplus/llgo/internal/runtime.PrintUint"(i64 %6) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32) + %17 = zext i32 %8 to i64 + call void @"github.com/goplus/llgo/internal/runtime.PrintUint"(i64 %17) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32) + %18 = zext i8 %10 to i64 + call void @"github.com/goplus/llgo/internal/runtime.PrintUint"(i64 %18) + call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32) + %19 = zext i8 %12 to i64 + call void @"github.com/goplus/llgo/internal/runtime.PrintUint"(i64 %19) call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32) - call void @"github.com/goplus/llgo/internal/runtime.PrintPointer"(ptr %9) + 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 32) - call void @"github.com/goplus/llgo/internal/runtime.PrintPointer"(ptr %12) + call void @"github.com/goplus/llgo/internal/runtime.PrintPointer"(ptr %16) call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) + %20 = call ptr @"(*github.com/goplus/llgo/internal/abi.Type).Elem"(ptr %0) + %21 = icmp ne ptr %20, null + br i1 %21, label %_llgo_1, label %_llgo_2 + +_llgo_1: ; preds = %_llgo_0 + %22 = call ptr @"(*github.com/goplus/llgo/internal/abi.Type).Elem"(ptr %0) + %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 @1, ptr %24, align 8 + %25 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %23, i32 0, i32 1 + store i64 1, ptr %25, align 4 + %26 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %23, align 8 + %27 = call %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.StringCat"(%"github.com/goplus/llgo/internal/runtime.String" %1, %"github.com/goplus/llgo/internal/runtime.String" %26) + call void @main.dumpTyp(ptr %22, %"github.com/goplus/llgo/internal/runtime.String" %27) + br label %_llgo_2 + +_llgo_2: ; preds = %_llgo_1, %_llgo_0 ret void } @@ -218,7 +268,7 @@ _llgo_0: %92 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %89, i32 0, i32 2 store i64 0, ptr %92, align 4 %93 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %89, align 8 - %94 = load ptr, ptr @"[][0]_llgo_int", align 8 + %94 = load ptr, ptr @"[]_llgo_int", align 8 %95 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 24) store %"github.com/goplus/llgo/internal/runtime.Slice" %93, ptr %95, align 8 %96 = alloca %"github.com/goplus/llgo/internal/runtime.eface", align 8 @@ -230,7 +280,7 @@ _llgo_0: call void @main.dump(%"github.com/goplus/llgo/internal/runtime.eface" %99) %100 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 %101 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %100, i32 0, i32 0 - store ptr @0, ptr %101, align 8 + store ptr @2, ptr %101, align 8 %102 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %100, i32 0, i32 1 store i64 5, ptr %102, align 4 %103 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %100, align 8 @@ -259,18 +309,20 @@ _llgo_0: declare ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64) -declare i64 @"(*github.com/goplus/llgo/internal/abi.Type).Size"(ptr) +declare void @"github.com/goplus/llgo/internal/runtime.PrintString"(%"github.com/goplus/llgo/internal/runtime.String") declare i64 @"(*github.com/goplus/llgo/internal/abi.Type).Kind"(ptr) -declare ptr @"(*github.com/goplus/llgo/internal/abi.Type).Elem"(ptr) - declare void @"github.com/goplus/llgo/internal/runtime.PrintUint"(i64) declare void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8) declare void @"github.com/goplus/llgo/internal/runtime.PrintPointer"(ptr) +declare ptr @"(*github.com/goplus/llgo/internal/abi.Type).Elem"(ptr) + +declare %"github.com/goplus/llgo/internal/runtime.String" @"github.com/goplus/llgo/internal/runtime.StringCat"(%"github.com/goplus/llgo/internal/runtime.String", %"github.com/goplus/llgo/internal/runtime.String") + declare void @"github.com/goplus/llgo/internal/abi.init"() declare void @"github.com/goplus/llgo/internal/runtime.init"() @@ -336,83 +388,82 @@ _llgo_5: ; preds = %_llgo_4 br label %_llgo_6 _llgo_6: ; preds = %_llgo_5, %_llgo_4 - %23 = load ptr, ptr @"[][0]_llgo_int", align 8 + %23 = load ptr, ptr @"[]_llgo_int", align 8 %24 = icmp eq ptr %23, null br i1 %24, label %_llgo_7, label %_llgo_8 _llgo_7: ; preds = %_llgo_6 %25 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) - %26 = call ptr @"github.com/goplus/llgo/internal/runtime.ArrayOf"(i64 0, ptr %25) - %27 = call ptr @"github.com/goplus/llgo/internal/runtime.SliceOf"(ptr %26) - store ptr %27, ptr @"[][0]_llgo_int", align 8 + %26 = call ptr @"github.com/goplus/llgo/internal/runtime.SliceOf"(ptr %25) + store ptr %26, ptr @"[]_llgo_int", align 8 br label %_llgo_8 _llgo_8: ; preds = %_llgo_7, %_llgo_6 - %28 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %29 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %28, i32 0, i32 0 - store ptr @1, ptr %29, align 8 - %30 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %28, i32 0, i32 1 - store i64 1, ptr %30, align 4 - %31 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %28, align 8 - %32 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 3) - %33 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %34 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %33, i32 0, i32 0 - store ptr @2, ptr %34, align 8 - %35 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %33, i32 0, i32 1 - store i64 0, ptr %35, align 4 - %36 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %33, align 8 - %37 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %31, ptr %32, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %36, i1 false) - %38 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %39 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %38, i32 0, i32 0 - store ptr @3, ptr %39, align 8 - %40 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %38, i32 0, i32 1 - store i64 1, ptr %40, align 4 - %41 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %38, align 8 - %42 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) - %43 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %44 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %43, i32 0, i32 0 - store ptr @4, ptr %44, align 8 - %45 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %43, i32 0, i32 1 - store i64 0, ptr %45, align 4 - %46 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %43, align 8 - %47 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %41, ptr %42, i64 8, %"github.com/goplus/llgo/internal/runtime.String" %46, i1 false) - %48 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %49 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %48, i32 0, i32 0 - store ptr @5, ptr %49, align 8 - %50 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %48, i32 0, i32 1 - store i64 1, ptr %50, align 4 - %51 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %48, align 8 - %52 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) - %53 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %54 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %53, i32 0, i32 0 - store ptr @6, ptr %54, align 8 - %55 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %53, i32 0, i32 1 - store i64 0, ptr %55, align 4 - %56 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %53, align 8 - %57 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %51, ptr %52, i64 16, %"github.com/goplus/llgo/internal/runtime.String" %56, i1 false) - %58 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 - %59 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %58, i32 0, i32 0 - store ptr @7, ptr %59, align 8 - %60 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %58, i32 0, i32 1 - store i64 4, ptr %60, align 4 - %61 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %58, align 8 - %62 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 168) - %63 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %62, i64 0 - store %"github.com/goplus/llgo/internal/abi.StructField" %37, ptr %63, align 8 - %64 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %62, i64 1 - store %"github.com/goplus/llgo/internal/abi.StructField" %47, ptr %64, align 8 - %65 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %62, i64 2 - store %"github.com/goplus/llgo/internal/abi.StructField" %57, ptr %65, align 8 - %66 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 - %67 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %66, i32 0, i32 0 - store ptr %62, ptr %67, align 8 - %68 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %66, i32 0, i32 1 + %27 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %28 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %27, i32 0, i32 0 + store ptr @3, ptr %28, align 8 + %29 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %27, i32 0, i32 1 + store i64 1, ptr %29, align 4 + %30 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %27, align 8 + %31 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 3) + %32 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %33 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %32, i32 0, i32 0 + store ptr @4, ptr %33, align 8 + %34 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %32, i32 0, i32 1 + store i64 0, ptr %34, align 4 + %35 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %32, align 8 + %36 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %30, ptr %31, i64 0, %"github.com/goplus/llgo/internal/runtime.String" %35, i1 false) + %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 @5, ptr %38, align 8 + %39 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %37, i32 0, i32 1 + store i64 1, ptr %39, align 4 + %40 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %37, align 8 + %41 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) + %42 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %43 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %42, i32 0, i32 0 + store ptr @6, ptr %43, align 8 + %44 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %42, i32 0, i32 1 + store i64 0, ptr %44, align 4 + %45 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %42, align 8 + %46 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %40, ptr %41, i64 8, %"github.com/goplus/llgo/internal/runtime.String" %45, i1 false) + %47 = alloca %"github.com/goplus/llgo/internal/runtime.String", align 8 + %48 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %47, i32 0, i32 0 + store ptr @7, ptr %48, align 8 + %49 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %47, i32 0, i32 1 + store i64 1, ptr %49, align 4 + %50 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %47, align 8 + %51 = call ptr @"github.com/goplus/llgo/internal/runtime.Basic"(i64 2) + %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 @8, ptr %53, align 8 + %54 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %52, i32 0, i32 1 + store i64 0, ptr %54, align 4 + %55 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %52, align 8 + %56 = call %"github.com/goplus/llgo/internal/abi.StructField" @"github.com/goplus/llgo/internal/runtime.StructField"(%"github.com/goplus/llgo/internal/runtime.String" %50, ptr %51, i64 16, %"github.com/goplus/llgo/internal/runtime.String" %55, i1 false) + %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 @9, ptr %58, align 8 + %59 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.String", ptr %57, i32 0, i32 1 + store i64 4, ptr %59, align 4 + %60 = load %"github.com/goplus/llgo/internal/runtime.String", ptr %57, align 8 + %61 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocU"(i64 168) + %62 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %61, i64 0 + store %"github.com/goplus/llgo/internal/abi.StructField" %36, ptr %62, align 8 + %63 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %61, i64 1 + store %"github.com/goplus/llgo/internal/abi.StructField" %46, ptr %63, align 8 + %64 = getelementptr %"github.com/goplus/llgo/internal/abi.StructField", ptr %61, i64 2 + store %"github.com/goplus/llgo/internal/abi.StructField" %56, ptr %64, align 8 + %65 = alloca %"github.com/goplus/llgo/internal/runtime.Slice", align 8 + %66 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %65, i32 0, i32 0 + store ptr %61, ptr %66, align 8 + %67 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %65, i32 0, i32 1 + store i64 3, ptr %67, align 4 + %68 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %65, i32 0, i32 2 store i64 3, ptr %68, align 4 - %69 = getelementptr inbounds %"github.com/goplus/llgo/internal/runtime.Slice", ptr %66, i32 0, i32 2 - store i64 3, ptr %69, align 4 - %70 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %66, align 8 - %71 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %61, i64 24, %"github.com/goplus/llgo/internal/runtime.Slice" %70) - store ptr %71, ptr @"main.struct$RKbUG45GE4henGMAdmt0Rju0JptyR8NsX7IZLsOI0OM", align 8 + %69 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %65, align 8 + %70 = call ptr @"github.com/goplus/llgo/internal/runtime.Struct"(%"github.com/goplus/llgo/internal/runtime.String" %60, i64 24, %"github.com/goplus/llgo/internal/runtime.Slice" %69) + store ptr %70, ptr @"main.struct$RKbUG45GE4henGMAdmt0Rju0JptyR8NsX7IZLsOI0OM", align 8 ret void } diff --git a/cl/_testrt/builtin/out.ll b/cl/_testrt/builtin/out.ll index dfc390903..c0a05db6e 100644 --- a/cl/_testrt/builtin/out.ll +++ b/cl/_testrt/builtin/out.ll @@ -177,28 +177,28 @@ _llgo_0: %34 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 2 %35 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 2 %36 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 0 - %37 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %36, i64 32, i64 %34, i64 1, i64 %35, i64 %34) + %37 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %36, i64 8, i64 %34, i64 1, i64 %35, i64 %34) %38 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %37, 1 %39 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 2 %40 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 2 %41 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 0 - %42 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %41, i64 32, i64 %39, i64 1, i64 %40, i64 %39) + %42 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %41, i64 8, i64 %39, i64 1, i64 %40, i64 %39) %43 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %42, 2 %44 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 2 %45 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 0 - %46 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %45, i64 32, i64 %44, i64 1, i64 2, i64 %44) + %46 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %45, i64 8, i64 %44, i64 1, i64 2, i64 %44) %47 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %46, 1 %48 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 2 %49 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 0 - %50 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %49, i64 32, i64 %48, i64 1, i64 2, i64 %48) + %50 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %49, i64 8, i64 %48, i64 1, i64 2, i64 %48) %51 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %50, 2 %52 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 2 %53 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 0 - %54 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %53, i64 32, i64 %52, i64 1, i64 2, i64 2) + %54 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %53, i64 8, i64 %52, i64 1, i64 2, i64 2) %55 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %54, 1 %56 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 2 %57 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %11, 0 - %58 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %57, i64 32, i64 %56, i64 1, i64 2, i64 2) + %58 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.NewSlice3"(ptr %57, i64 8, i64 %56, i64 1, i64 2, i64 2) %59 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %58, 2 call void @"github.com/goplus/llgo/internal/runtime.PrintInt"(i64 %38) call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 32) @@ -293,7 +293,7 @@ _llgo_0: %103 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %99, align 8 %104 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %103, 0 %105 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %103, 1 - %106 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.SliceAppend"(%"github.com/goplus/llgo/internal/runtime.Slice" %11, ptr %104, i64 %105, i64 32) + %106 = call %"github.com/goplus/llgo/internal/runtime.Slice" @"github.com/goplus/llgo/internal/runtime.SliceAppend"(%"github.com/goplus/llgo/internal/runtime.Slice" %11, ptr %104, i64 %105, i64 8) call void @"github.com/goplus/llgo/internal/runtime.PrintSlice"(%"github.com/goplus/llgo/internal/runtime.Slice" %106) call void @"github.com/goplus/llgo/internal/runtime.PrintByte"(i8 10) %107 = call ptr @"github.com/goplus/llgo/internal/runtime.AllocZ"(i64 3) @@ -367,7 +367,7 @@ _llgo_0: %137 = load %"github.com/goplus/llgo/internal/runtime.Slice", ptr %133, align 8 %138 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %122, 0 %139 = extractvalue %"github.com/goplus/llgo/internal/runtime.Slice" %122, 1 - %140 = call i64 @"github.com/goplus/llgo/internal/runtime.SliceCopy"(%"github.com/goplus/llgo/internal/runtime.Slice" %137, ptr %138, i64 %139, i64 3) + %140 = call i64 @"github.com/goplus/llgo/internal/runtime.SliceCopy"(%"github.com/goplus/llgo/internal/runtime.Slice" %137, ptr %138, i64 %139, i64 1) store i64 %140, ptr %132, align 4 %141 = load i64, ptr %132, align 4 %142 = getelementptr inbounds i8, ptr %131, i64 0 diff --git a/ssa/datastruct.go b/ssa/datastruct.go index 037238c1d..aa09b8c01 100644 --- a/ssa/datastruct.go +++ b/ssa/datastruct.go @@ -250,7 +250,8 @@ func (b Builder) Slice(x, low, high, max Expr) (ret Expr) { nCap = prog.IntVal(uint64(te.Len()), prog.Int()) if high.IsNil() { if lowIsNil && max.IsNil() { - return b.unsafeSlice(x, nCap.impl, nCap.impl) + ret.impl = b.unsafeSlice(x, nCap.impl, nCap.impl).impl + return } high = nCap }