From 40e002ae2b0205d116ef5ac1997d6f57e2c66e64 Mon Sep 17 00:00:00 2001 From: r00ster91 Date: Fri, 19 May 2023 15:12:19 +0200 Subject: [PATCH 1/3] std.builtin.StackTrace: don't print extra newline after stack trace --- lib/std/builtin.zig | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig index 99761b146d..224fc1c618 100644 --- a/lib/std/builtin.zig +++ b/lib/std/builtin.zig @@ -56,7 +56,6 @@ pub const StackTrace = struct { std.debug.writeStackTrace(self, writer, arena.allocator(), debug_info, tty_config) catch |err| { try writer.print("Unable to print stack trace: {s}\n", .{@errorName(err)}); }; - try writer.writeAll("\n"); } }; From 8385b2c3797aa9777621dff55fe004924968d118 Mon Sep 17 00:00:00 2001 From: r00ster91 Date: Fri, 19 May 2023 15:37:44 +0200 Subject: [PATCH 2/3] Sema.analyzeBodyInner: fix some spaces --- src/Sema.zig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Sema.zig b/src/Sema.zig index c1ec7d1f01..48c2be86aa 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -1088,25 +1088,25 @@ fn analyzeBodyInner( .error_set_decl_anon => try sema.zirErrorSetDecl(block, inst, .anon), .error_set_decl_func => try sema.zirErrorSetDecl(block, inst, .func), - .add => try sema.zirArithmetic(block, inst, .add, true), - .addwrap => try sema.zirArithmetic(block, inst, .addwrap, true), - .add_sat => try sema.zirArithmetic(block, inst, .add_sat, true), - .add_unsafe=> try sema.zirArithmetic(block, inst, .add_unsafe, false), - .mul => try sema.zirArithmetic(block, inst, .mul, true), - .mulwrap => try sema.zirArithmetic(block, inst, .mulwrap, true), - .mul_sat => try sema.zirArithmetic(block, inst, .mul_sat, true), - .sub => try sema.zirArithmetic(block, inst, .sub, true), - .subwrap => try sema.zirArithmetic(block, inst, .subwrap, true), - .sub_sat => try sema.zirArithmetic(block, inst, .sub_sat, true), + .add => try sema.zirArithmetic(block, inst, .add, true), + .addwrap => try sema.zirArithmetic(block, inst, .addwrap, true), + .add_sat => try sema.zirArithmetic(block, inst, .add_sat, true), + .add_unsafe => try sema.zirArithmetic(block, inst, .add_unsafe, false), + .mul => try sema.zirArithmetic(block, inst, .mul, true), + .mulwrap => try sema.zirArithmetic(block, inst, .mulwrap, true), + .mul_sat => try sema.zirArithmetic(block, inst, .mul_sat, true), + .sub => try sema.zirArithmetic(block, inst, .sub, true), + .subwrap => try sema.zirArithmetic(block, inst, .subwrap, true), + .sub_sat => try sema.zirArithmetic(block, inst, .sub_sat, true), .div => try sema.zirDiv(block, inst), .div_exact => try sema.zirDivExact(block, inst), .div_floor => try sema.zirDivFloor(block, inst), .div_trunc => try sema.zirDivTrunc(block, inst), - .mod_rem => try sema.zirModRem(block, inst), - .mod => try sema.zirMod(block, inst), - .rem => try sema.zirRem(block, inst), + .mod_rem => try sema.zirModRem(block, inst), + .mod => try sema.zirMod(block, inst), + .rem => try sema.zirRem(block, inst), .max => try sema.zirMinMax(block, inst, .max), .min => try sema.zirMinMax(block, inst, .min), From 2463f4df7780e268546cfd5bb0550f20114a0c1b Mon Sep 17 00:00:00 2001 From: r00ster91 Date: Fri, 19 May 2023 17:44:48 +0200 Subject: [PATCH 3/3] addrspace: small cleanups --- lib/std/builtin.zig | 2 ++ src/Sema.zig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig index 224fc1c618..e273d4c0c7 100644 --- a/lib/std/builtin.zig +++ b/lib/std/builtin.zig @@ -190,10 +190,12 @@ pub const CallingConvention = enum(u8) { /// This data structure is used by the Zig language code generation and /// therefore must be kept in sync with the compiler implementation. pub const AddressSpace = enum(u5) { + // CPU address spaces. generic, gs, fs, ss, + // GPU address spaces. global, constant, diff --git a/src/Sema.zig b/src/Sema.zig index 48c2be86aa..66302ebc0d 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -35631,7 +35631,7 @@ pub fn analyzeAddressSpace( ctx: AddressSpaceContext, ) !std.builtin.AddressSpace { const mod = sema.mod; - const addrspace_tv = try sema.resolveInstConst(block, src, zir_ref, "addresspace must be comptime-known"); + const addrspace_tv = try sema.resolveInstConst(block, src, zir_ref, "address space must be comptime-known"); const address_space = mod.toEnum(std.builtin.AddressSpace, addrspace_tv.val); const target = sema.mod.getTarget(); const arch = target.cpu.arch;