authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-07-11 23:06:12-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2023-07-11 23:06:12-07:00
log660955c0d64fdbda41e1ff7dddc40c5c4393c42c
tree403e2b57ac341c706659ac3620246c1f19b778e0
parenta7707d8279d32b025cac4de0ddc9abeb25f31243
parent2463f4df7780e268546cfd5bb0550f20114a0c1b
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #15775 from r00ster91/newlines

remove some newlines and other minor cleanups

2 files changed, 16 insertions(+), 15 deletions(-)

lib/std/builtin.zig+2-1
......@@ -56,7 +56,6 @@ pub const StackTrace = struct {
5656 std.debug.writeStackTrace(self, writer, arena.allocator(), debug_info, tty_config) catch |err| {
5757 try writer.print("Unable to print stack trace: {s}\n", .{@errorName(err)});
5858 };
59 try writer.writeAll("\n");
6059 }
6160};
6261
......@@ -191,10 +190,12 @@ pub const CallingConvention = enum(u8) {
191190/// This data structure is used by the Zig language code generation and
192191/// therefore must be kept in sync with the compiler implementation.
193192pub const AddressSpace = enum(u5) {
193 // CPU address spaces.
194194 generic,
195195 gs,
196196 fs,
197197 ss,
198
198199 // GPU address spaces.
199200 global,
200201 constant,
src/Sema.zig+14-14
......@@ -1088,25 +1088,25 @@ fn analyzeBodyInner(
10881088 .error_set_decl_anon => try sema.zirErrorSetDecl(block, inst, .anon),
10891089 .error_set_decl_func => try sema.zirErrorSetDecl(block, inst, .func),
10901090
1091 .add => try sema.zirArithmetic(block, inst, .add, true),
1092 .addwrap => try sema.zirArithmetic(block, inst, .addwrap, true),
1093 .add_sat => try sema.zirArithmetic(block, inst, .add_sat, true),
1094 .add_unsafe=> try sema.zirArithmetic(block, inst, .add_unsafe, false),
1095 .mul => try sema.zirArithmetic(block, inst, .mul, true),
1096 .mulwrap => try sema.zirArithmetic(block, inst, .mulwrap, true),
1097 .mul_sat => try sema.zirArithmetic(block, inst, .mul_sat, true),
1098 .sub => try sema.zirArithmetic(block, inst, .sub, true),
1099 .subwrap => try sema.zirArithmetic(block, inst, .subwrap, true),
1100 .sub_sat => try sema.zirArithmetic(block, inst, .sub_sat, true),
1091 .add => try sema.zirArithmetic(block, inst, .add, true),
1092 .addwrap => try sema.zirArithmetic(block, inst, .addwrap, true),
1093 .add_sat => try sema.zirArithmetic(block, inst, .add_sat, true),
1094 .add_unsafe => try sema.zirArithmetic(block, inst, .add_unsafe, false),
1095 .mul => try sema.zirArithmetic(block, inst, .mul, true),
1096 .mulwrap => try sema.zirArithmetic(block, inst, .mulwrap, true),
1097 .mul_sat => try sema.zirArithmetic(block, inst, .mul_sat, true),
1098 .sub => try sema.zirArithmetic(block, inst, .sub, true),
1099 .subwrap => try sema.zirArithmetic(block, inst, .subwrap, true),
1100 .sub_sat => try sema.zirArithmetic(block, inst, .sub_sat, true),
11011101
11021102 .div => try sema.zirDiv(block, inst),
11031103 .div_exact => try sema.zirDivExact(block, inst),
11041104 .div_floor => try sema.zirDivFloor(block, inst),
11051105 .div_trunc => try sema.zirDivTrunc(block, inst),
11061106
1107 .mod_rem => try sema.zirModRem(block, inst),
1108 .mod => try sema.zirMod(block, inst),
1109 .rem => try sema.zirRem(block, inst),
1107 .mod_rem => try sema.zirModRem(block, inst),
1108 .mod => try sema.zirMod(block, inst),
1109 .rem => try sema.zirRem(block, inst),
11101110
11111111 .max => try sema.zirMinMax(block, inst, .max),
11121112 .min => try sema.zirMinMax(block, inst, .min),
......@@ -35670,7 +35670,7 @@ pub fn analyzeAddressSpace(
3567035670 ctx: AddressSpaceContext,
3567135671) !std.builtin.AddressSpace {
3567235672 const mod = sema.mod;
35673 const addrspace_tv = try sema.resolveInstConst(block, src, zir_ref, "addresspace must be comptime-known");
35673 const addrspace_tv = try sema.resolveInstConst(block, src, zir_ref, "address space must be comptime-known");
3567435674 const address_space = mod.toEnum(std.builtin.AddressSpace, addrspace_tv.val);
3567535675 const target = sema.mod.getTarget();
3567635676 const arch = target.cpu.arch;