admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llgo/ssa: MapUpdate fix

Browse Source
This commit is contained in:
xushiwei
2024-06-14 22:33:40 +08:00
parent 8d42acec16
commit e107567997
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cl/_testrt/map/out.ll
View File

@@ -30,12 +30,16 @@ _llgo_0:
call void @main.init() call void @main.init()
%2 = call ptr @"github.com/goplus/llgo/internal/runtime.MakeSmallMap"() %2 = call ptr @"github.com/goplus/llgo/internal/runtime.MakeSmallMap"()
%3 = load ptr, ptr @"map[_llgo_int]_llgo_int", align 8 %3 = load ptr, ptr @"map[_llgo_int]_llgo_int", align 8
%4 = call ptr @"github.com/goplus/llgo/internal/runtime.MapAssign"(ptr %3, ptr %2, i64 23) %4 = alloca i8, i64 48, align 1
store i64 100, ptr %4, align 4 store ptr %2, ptr %4, align 8
%5 = load ptr, ptr @"map[_llgo_int]_llgo_int", align 8 %5 = call ptr @"github.com/goplus/llgo/internal/runtime.MapAssign"(ptr %3, ptr %4, i64 23)
%6 = call ptr @"github.com/goplus/llgo/internal/runtime.MapAssign"(ptr %5, ptr %2, i64 7) store i64 100, ptr %5, align 4
store i64 29, ptr %6, align 4 %6 = load ptr, ptr @"map[_llgo_int]_llgo_int", align 8
%7 = call i32 (ptr, ...) @printf(ptr @0, <null operand!>) %7 = alloca i8, i64 48, align 1
store ptr %2, ptr %7, align 8
%8 = call ptr @"github.com/goplus/llgo/internal/runtime.MapAssign"(ptr %6, ptr %7, i64 7)
store i64 29, ptr %8, align 4
%9 = call i32 (ptr, ...) @printf(ptr @0, <null operand!>)
ret i32 0 ret i32 0
} }

3
ssa/datastruct.go
View File

@@ -366,7 +366,8 @@ func (b Builder) MapUpdate(m, k, v Expr) {
} }
tabi := b.abiType(t.raw.Type) tabi := b.abiType(t.raw.Type)
prog := b.Prog prog := b.Prog
ptrimpl := b.InlineCall(b.Pkg.rtFunc("MapAssign"), tabi, m, k).impl mptr := b.dupAlloca(m)
ptrimpl := b.InlineCall(b.Pkg.rtFunc("MapAssign"), tabi, mptr, k).impl
ptr := Expr{ptrimpl, prog.Pointer(v.Type)} ptr := Expr{ptrimpl, prog.Pointer(v.Type)}
b.Store(ptr, v) // TODO(xsw): indirect store b.Store(ptr, v) // TODO(xsw): indirect store
} }

11
ssa/memory.go
View File

@@ -107,16 +107,15 @@ func aggregateInit(b llvm.Builder, ptr llvm.Value, tll llvm.Type, flds ...llvm.V
} }
} }
/* func (b Builder) dupAlloca(v Expr) Expr {
func (b Builder) dupMalloc(v Expr) Expr {
prog := b.Prog prog := b.Prog
n := prog.SizeOf(v.Type) n := prog.SizeOf(v.Type)
tptr := prog.Pointer(v.Type) tptr := prog.Pointer(v.Type)
ptr := b.malloc(prog.Val(uintptr(n))).impl ptr := b.Alloca(prog.Val(uintptr(n))).impl
b.Store(Expr{ptr, tptr}, v) ret := Expr{ptr, tptr}
return Expr{ptr, tptr} b.Store(ret, v)
return ret
} }
*/
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------