authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-04-03 04:55:27-04:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-04-03 18:02:55+02:00
log5900dc05804a4089eb7d1ccd8a36b4ade16c02e4
tree35b48b2b31be891a3a3f0dcf34562a7c099e2c98
parent562170681a3d0c8502892f8975f369c4b269fe1a

x86_64: fix typos

8 files changed, 3 insertions(+), 13 deletions(-)

src/arch/x86_64/CodeGen.zig+2-2
......@@ -2528,7 +2528,7 @@ fn airErrUnionPayloadPtrSet(self: *Self, inst: Air.Inst.Index) !void {
25282528 const dst_lock = self.register_manager.lockReg(dst_reg);
25292529 defer if (dst_lock) |lock| self.register_manager.unlockReg(lock);
25302530
2531 const pl_off = @intCast(i32, errUnionErrorOffset(pl_ty, self.target.*));
2531 const pl_off = @intCast(i32, errUnionPayloadOffset(pl_ty, self.target.*));
25322532 const dst_abi_size = @intCast(u32, dst_ty.abiSize(self.target.*));
25332533 try self.asmRegisterMemory(
25342534 .lea,
......@@ -5602,7 +5602,7 @@ fn airCmp(self: *Self, inst: Air.Inst.Index, op: math.CompareOperator) !void {
56025602
56035603 const rhs_mcv = try self.resolveInst(bin_op.rhs);
56045604 const rhs_lock = switch (rhs_mcv) {
5605 .register => |reg| self.register_manager.lockRegAssumeUnused(reg),
5605 .register => |reg| self.register_manager.lockReg(reg),
56065606 else => null,
56075607 };
56085608 defer if (rhs_lock) |lock| self.register_manager.unlockReg(lock);
src/print_air.zig+1
......@@ -804,6 +804,7 @@ const Writer = struct {
804804 var case_i: u32 = 0;
805805
806806 try w.writeOperand(s, inst, 0, pl_op.operand);
807 if (w.skip_body) return s.writeAll(", ...");
807808 const old_indent = w.indent;
808809 w.indent += 2;
809810
test/behavior/bugs/12776.zig-1
......@@ -31,7 +31,6 @@ const CPU = packed struct {
3131test {
3232 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
3333 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
34 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
3534 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
3635
3736 var ram = try RAM.new();
test/behavior/bugs/1442.zig-1
......@@ -9,7 +9,6 @@ const Union = union(enum) {
99test "const error union field alignment" {
1010 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
1111 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
12 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
1312 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1413 var union_or_err: anyerror!Union = Union{ .Color = 1234 };
1514 try std.testing.expect((union_or_err catch unreachable).Color == 1234);
test/behavior/error.zig-4
......@@ -370,7 +370,6 @@ fn intLiteral(str: []const u8) !?i64 {
370370}
371371
372372test "nested error union function call in optional unwrap" {
373 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
374373 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
375374 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
376375 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
......@@ -499,7 +498,6 @@ test "function pointer with return type that is error union with payload which i
499498}
500499
501500test "return result loc as peer result loc in inferred error set function" {
502 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
503501 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
504502 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
505503 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
......@@ -531,7 +529,6 @@ test "return result loc as peer result loc in inferred error set function" {
531529}
532530
533531test "error payload type is correctly resolved" {
534 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
535532 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
536533 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
537534 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
......@@ -665,7 +662,6 @@ test "coerce error set to the current inferred error set" {
665662}
666663
667664test "error union payload is properly aligned" {
668 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
669665 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
670666 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
671667 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
test/behavior/struct.zig-3
......@@ -1116,7 +1116,6 @@ test "for loop over pointers to struct, getting field from struct pointer" {
11161116}
11171117
11181118test "anon init through error unions and optionals" {
1119 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
11201119 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
11211120 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11221121 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
......@@ -1162,7 +1161,6 @@ test "anon init through optional" {
11621161}
11631162
11641163test "anon init through error union" {
1165 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
11661164 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
11671165 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11681166 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
......@@ -1182,7 +1180,6 @@ test "anon init through error union" {
11821180}
11831181
11841182test "typed init through error unions and optionals" {
1185 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
11861183 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
11871184 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11881185 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
test/behavior/switch_prong_err_enum.zig-1
......@@ -23,7 +23,6 @@ fn doThing(form_id: u64) anyerror!FormValue {
2323test "switch prong returns error enum" {
2424 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
2525 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
26 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
2726 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2827
2928 switch (doThing(17) catch unreachable) {
test/behavior/switch_prong_implicit_cast.zig-1
......@@ -17,7 +17,6 @@ fn foo(id: u64) !FormValue {
1717test "switch prong implicit cast" {
1818 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
1919 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
20 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
2120 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2221
2322 const result = switch (foo(2) catch unreachable) {