From 05431d7c4a8cb20a3a70553ef0d0f8ed00a05402 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Mon, 28 Feb 2022 17:48:38 +0100 Subject: x64: impl unwrap_errunion_payload and unwrap_errunion_err for register --- test/behavior/error.zig | 4 ---- 1 file changed, 4 deletions(-) (limited to 'test/behavior/error.zig') diff --git a/test/behavior/error.zig b/test/behavior/error.zig index ab58874c34..8e7ed3607e 100644 --- a/test/behavior/error.zig +++ b/test/behavior/error.zig @@ -78,7 +78,6 @@ fn unwrapSimpleValueFromErrorDo() anyerror!isize { } test "error return in assignment" { - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; @@ -121,7 +120,6 @@ test "widen cast integer payload of error union function call" { } test "debug info for optional error set" { - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; @@ -173,7 +171,6 @@ fn bar2() (error{}!void) {} test "error union type " { if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO try testErrorUnionType(); @@ -191,7 +188,6 @@ fn testErrorUnionType() !void { test "error set type" { if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO try testErrorSetType(); -- cgit v1.2.3 From 12cdb36c5ba1fd9dfa5985d36a2f5955528c2de7 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Mon, 28 Feb 2022 18:19:25 +0100 Subject: codegen: fix padding calculation for error unions when lowering * do not track `rdi` register before `call` inst, but instead freeze it from further use, until `call` has been realised * pass more error union tests --- src/arch/x86_64/CodeGen.zig | 4 +++- src/codegen.zig | 45 ++++++++++++++++++--------------------------- test/behavior/error.zig | 5 ----- 3 files changed, 21 insertions(+), 33 deletions(-) (limited to 'test/behavior/error.zig') diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index 6bfea043c6..4fcd57161c 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -3167,11 +3167,13 @@ fn airCall(self: *Self, inst: Air.Inst.Index) !void { const ret_abi_align = @intCast(u32, ret_ty.abiAlignment(self.target.*)); const stack_offset = @intCast(i32, try self.allocMem(inst, ret_abi_size, ret_abi_align)); - try self.register_manager.getReg(.rdi, inst); + try self.register_manager.getReg(.rdi, null); + self.register_manager.freezeRegs(&.{.rdi}); try self.genSetReg(Type.usize, .rdi, .{ .ptr_stack_offset = stack_offset }); info.return_value.stack_offset = stack_offset; } + defer if (info.return_value == .stack_offset) self.register_manager.unfreezeRegs(&.{.rdi}); for (args) |arg, arg_i| { const mc_arg = info.args[arg_i]; diff --git a/src/codegen.zig b/src/codegen.zig index 2484cb0e59..d72c2efb5b 100644 --- a/src/codegen.zig +++ b/src/codegen.zig @@ -553,31 +553,21 @@ pub fn generateSymbol( const target = bin_file.options.target; const abi_align = typed_value.ty.abiAlignment(target); - { - const error_val = if (!is_payload) typed_value.val else Value.initTag(.zero); - const begin = code.items.len; - switch (try generateSymbol(bin_file, parent_atom_index, src_loc, .{ - .ty = error_ty, - .val = error_val, - }, code, debug_output)) { - .appended => {}, - .externally_managed => |external_slice| { - code.appendSliceAssumeCapacity(external_slice); - }, - .fail => |em| return Result{ .fail = em }, - } - const unpadded_end = code.items.len - begin; - const padded_end = mem.alignForwardGeneric(u64, unpadded_end, abi_align); - const padding = try math.cast(usize, padded_end - unpadded_end); - - if (padding > 0) { - try code.writer().writeByteNTimes(0, padding); - } + const error_val = if (!is_payload) typed_value.val else Value.initTag(.zero); + const begin = code.items.len; + switch (try generateSymbol(bin_file, parent_atom_index, src_loc, .{ + .ty = error_ty, + .val = error_val, + }, code, debug_output)) { + .appended => {}, + .externally_managed => |external_slice| { + code.appendSliceAssumeCapacity(external_slice); + }, + .fail => |em| return Result{ .fail = em }, } if (payload_ty.hasRuntimeBits()) { const payload_val = if (typed_value.val.castTag(.eu_payload)) |val| val.data else Value.initTag(.undef); - const begin = code.items.len; switch (try generateSymbol(bin_file, parent_atom_index, src_loc, .{ .ty = payload_ty, .val = payload_val, @@ -588,13 +578,14 @@ pub fn generateSymbol( }, .fail => |em| return Result{ .fail = em }, } - const unpadded_end = code.items.len - begin; - const padded_end = mem.alignForwardGeneric(u64, unpadded_end, abi_align); - const padding = try math.cast(usize, padded_end - unpadded_end); + } - if (padding > 0) { - try code.writer().writeByteNTimes(0, padding); - } + const unpadded_end = code.items.len - begin; + const padded_end = mem.alignForwardGeneric(u64, unpadded_end, abi_align); + const padding = try math.cast(usize, padded_end - unpadded_end); + + if (padding > 0) { + try code.writer().writeByteNTimes(0, padding); } return Result{ .appended = {} }; diff --git a/test/behavior/error.zig b/test/behavior/error.zig index 8e7ed3607e..0dda7472ea 100644 --- a/test/behavior/error.zig +++ b/test/behavior/error.zig @@ -23,7 +23,6 @@ fn shouldBeNotEqual(a: anyerror, b: anyerror) void { } test "error binary operator" { - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; @@ -58,7 +57,6 @@ pub fn baz() anyerror!i32 { } test "error wrapping" { - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; @@ -66,7 +64,6 @@ test "error wrapping" { } test "unwrap simple value from error" { - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; @@ -102,7 +99,6 @@ test "syntax: optional operator in front of error union operator" { } test "widen cast integer payload of error union function call" { - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; @@ -307,7 +303,6 @@ test "error: Infer error set from literals" { if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO _ = nullLiteral("n") catch |err| handleErrors(err); -- cgit v1.2.3