From e16c6c1b6b6bb5fd870507f6b4051ce27dba0dd9 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 12 Jun 2023 12:58:47 +0100 Subject: [PATCH 1/2] Replace procedure `strings.concatenate` --- core/os/os2/path_windows.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/os/os2/path_windows.odin b/core/os/os2/path_windows.odin index 2dc667822..a2306784e 100644 --- a/core/os/os2/path_windows.odin +++ b/core/os/os2/path_windows.odin @@ -23,7 +23,7 @@ _mkdir_all :: proc(path: string, perm: File_Mode) -> Error { fix_root_directory :: proc(p: string) -> (s: string, allocated: bool, err: runtime.Allocator_Error) { if len(p) == len(`\\?\c:`) { if is_path_separator(p[0]) && is_path_separator(p[1]) && p[2] == '?' && is_path_separator(p[3]) && p[5] == ':' { - s = strings.concatenate_safe({p, `\`}, _file_allocator()) or_return + s = strings.concatenate({p, `\`}, _file_allocator()) or_return allocated = true return } From dca0fae781c9a21cacda44eaa9fd08d1929e0854 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 12 Jun 2023 13:42:51 +0100 Subject: [PATCH 2/2] Improve lb_generate_anonymous_proc_lit (again) --- src/llvm_backend.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 2897d3ca7..1acd15ad6 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -785,12 +785,10 @@ gb_internal lbValue lb_generate_anonymous_proc_lit(lbModule *m, String const &pr // NOTE(bill): Generate a new name // parent$count - isize name_len = prefix_name.len + 1 + 8 + 1; + isize name_len = prefix_name.len + 6 + 11; char *name_text = gb_alloc_array(permanent_allocator(), char, name_len); static std::atomic name_id; - name_id.fetch_add(1); - - name_len = gb_snprintf(name_text, name_len, "%.*s$anon-%d", LIT(prefix_name), name_id.load()); + name_len = gb_snprintf(name_text, name_len, "%.*s$anon-%d", LIT(prefix_name), name_id.fetch_add(1)); String name = make_string((u8 *)name_text, name_len-1); Type *type = type_of_expr(expr);