From 8ddb493b96e7da8cb4afed7bb7abf365d1962973 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 14 Feb 2023 10:28:04 +0000 Subject: [PATCH 1/3] Add `#optional_allocator_error` to `make_map` --- core/runtime/core_builtin.odin | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/core/runtime/core_builtin.odin b/core/runtime/core_builtin.odin index cbcb162a8..ae6a4aaf4 100644 --- a/core/runtime/core_builtin.odin +++ b/core/runtime/core_builtin.odin @@ -231,13 +231,12 @@ make_dynamic_array_len_cap :: proc($T: typeid/[dynamic]$E, #any_int len: int, #a return } @(builtin) -make_map :: proc($T: typeid/map[$K]$E, #any_int capacity: int = 1< T { +make_map :: proc($T: typeid/map[$K]$E, #any_int capacity: int = 1< (m: T, err: Allocator_Error) #optional_allocator_error { make_map_expr_error_loc(loc, capacity) context.allocator = allocator - m: T - reserve_map(&m, capacity, loc) - return m + err = reserve_map(&m, capacity, loc) + return } @(builtin) make_multi_pointer :: proc($T: typeid/[^]$E, #any_int len: int, allocator := context.allocator, loc := #caller_location) -> (mp: T, err: Allocator_Error) #optional_allocator_error { @@ -276,10 +275,8 @@ clear_map :: proc "contextless" (m: ^$T/map[$K]$V) { } @builtin -reserve_map :: proc(m: ^$T/map[$K]$V, capacity: int, loc := #caller_location) { - if m != nil { - __dynamic_map_reserve((^Raw_Map)(m), map_info(T), uint(capacity), loc) - } +reserve_map :: proc(m: ^$T/map[$K]$V, capacity: int, loc := #caller_location) -> Allocator_Error { + return __dynamic_map_reserve((^Raw_Map)(m), map_info(T), uint(capacity), loc) if m != nil else nil } /* From 0f697a0f2678aa5522c6671662da550ce9a8bed5 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 14 Feb 2023 23:52:23 +0000 Subject: [PATCH 2/3] Move in_multi_assignment check tighter --- src/llvm_backend_general.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp index 73cf0d1b9..9b6b527e6 100644 --- a/src/llvm_backend_general.cpp +++ b/src/llvm_backend_general.cpp @@ -937,8 +937,8 @@ gb_internal void lb_emit_store(lbProcedure *p, lbValue ptr, lbValue value) { enum {MAX_STORE_SIZE = 64}; - if (!p->in_multi_assignment && lb_sizeof(LLVMTypeOf(value.value)) > MAX_STORE_SIZE) { - if (LLVMIsALoadInst(value.value)) { + if (lb_sizeof(LLVMTypeOf(value.value)) > MAX_STORE_SIZE) { + if (!p->in_multi_assignment && LLVMIsALoadInst(value.value)) { LLVMValueRef dst_ptr = ptr.value; LLVMValueRef src_ptr_original = LLVMGetOperand(value.value, 0); LLVMValueRef src_ptr = LLVMBuildPointerCast(p->builder, src_ptr_original, LLVMTypeOf(dst_ptr), ""); From 48685e8bf15dada1734ad6463fafb7d00c86b2b0 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 14 Feb 2023 23:52:36 +0000 Subject: [PATCH 3/3] Remove set volatile for store --- src/llvm_backend_general.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp index 9b6b527e6..89ed593a2 100644 --- a/src/llvm_backend_general.cpp +++ b/src/llvm_backend_general.cpp @@ -984,7 +984,7 @@ gb_internal void lb_emit_store(lbProcedure *p, lbValue ptr, lbValue value) { instr = LLVMBuildStore(p->builder, value.value, ptr.value); } - LLVMSetVolatile(instr, p->in_multi_assignment); + // LLVMSetVolatile(instr, p->in_multi_assignment); } gb_internal LLVMTypeRef llvm_addr_type(lbModule *module, lbValue addr_val) {