From 8fb0dfad94b799a3adf9eaec47d165c7201b4040 Mon Sep 17 00:00:00 2001 From: visualfc Date: Tue, 26 Nov 2024 11:09:39 +0800 Subject: [PATCH] ssa: abiNamed use NameOf --- cl/_testrt/tpabi/out.ll | 6 +++--- ssa/abitype.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cl/_testrt/tpabi/out.ll b/cl/_testrt/tpabi/out.ll index 08c76667..84ca611b 100644 --- a/cl/_testrt/tpabi/out.ll +++ b/cl/_testrt/tpabi/out.ll @@ -15,7 +15,7 @@ source_filename = "main" @__llgo_argv = global ptr null, align 8 @0 = private unnamed_addr constant [1 x i8] c"a", align 1 @"_llgo_main.T[string,int]" = linkonce global ptr null, align 8 -@1 = private unnamed_addr constant [19 x i8] c"main.T[string, int]", align 1 +@1 = private unnamed_addr constant [18 x i8] c"main.T[string,int]", align 1 @_llgo_string = linkonce global ptr null, align 8 @_llgo_int = linkonce global ptr null, align 8 @"main.struct$A2OTYqQyUOqOQ-i_F5iXeAKWtxeWGEuyeN7HCfULCDk" = linkonce global ptr null, align 8 @@ -164,7 +164,7 @@ declare void @llvm.memset(ptr nocapture writeonly, i8, i64, i1 immarg) #0 define void @"main.init$after"() { _llgo_0: - %0 = call ptr @"github.com/goplus/llgo/internal/runtime.NewNamed"(%"github.com/goplus/llgo/internal/runtime.String" { ptr @1, i64 19 }, i64 25, i64 24, i64 1, i64 2) + %0 = call ptr @"github.com/goplus/llgo/internal/runtime.NewNamed"(%"github.com/goplus/llgo/internal/runtime.String" { ptr @1, i64 18 }, i64 25, i64 24, i64 1, i64 2) %1 = load ptr, ptr @"_llgo_main.T[string,int]", align 8 %2 = icmp eq ptr %1, null br i1 %2, label %_llgo_1, label %_llgo_2 @@ -219,7 +219,7 @@ _llgo_7: ; preds = %_llgo_6 br i1 %24, label %_llgo_9, label %_llgo_10 _llgo_8: ; preds = %_llgo_10, %_llgo_6 - %25 = call ptr @"github.com/goplus/llgo/internal/runtime.NewNamed"(%"github.com/goplus/llgo/internal/runtime.String" { ptr @1, i64 19 }, i64 25, i64 24, i64 1, i64 2) + %25 = call ptr @"github.com/goplus/llgo/internal/runtime.NewNamed"(%"github.com/goplus/llgo/internal/runtime.String" { ptr @1, i64 18 }, i64 25, i64 24, i64 1, i64 2) %26 = load ptr, ptr @"*_llgo_main.T[string,int]", align 8 %27 = icmp eq ptr %26, null br i1 %27, label %_llgo_11, label %_llgo_12 diff --git a/ssa/abitype.go b/ssa/abitype.go index b72ec87f..f98de44d 100644 --- a/ssa/abitype.go +++ b/ssa/abitype.go @@ -210,7 +210,7 @@ func (b Builder) abiNamed(t *types.Named) Expr { size := b.sizeof(tunder) numMethods, numPtrMethods := b.abiMethods(t) newNamed := pkg.rtFunc("NewNamed") - expr := b.Call(newNamed, b.Str(t.String()), b.Prog.Val(kind), b.Prog.IntVal(uint64(size), b.Prog.Uintptr()), b.Prog.Val(numMethods), b.Prog.Val(numPtrMethods)) + expr := b.Call(newNamed, b.Str(NameOf(t)), b.Prog.Val(kind), b.Prog.IntVal(uint64(size), b.Prog.Uintptr()), b.Prog.Val(numMethods), b.Prog.Val(numPtrMethods)) return expr }