diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2022-03-01 09:14:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 09:14:23 +0100 |
| commit | ec54ceee6d34a61734ac6759ffdbd75248a2f3d7 (patch) | |
| tree | 21f600733435a9f63674c131b3d1df421b0618a7 /src/codegen.zig | |
| parent | f5a31cb0d693ef3c07da7f446c95999cef34488b (diff) | |
| parent | cfbc3537ef0b3a73d5b8fdd358cf3bb831935861 (diff) | |
| download | zig-ec54ceee6d34a61734ac6759ffdbd75248a2f3d7.tar.gz zig-ec54ceee6d34a61734ac6759ffdbd75248a2f3d7.zip | |
Merge pull request #11016 from ziglang/x64-more-codegen
Diffstat (limited to 'src/codegen.zig')
| -rw-r--r-- | src/codegen.zig | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/src/codegen.zig b/src/codegen.zig index 67119bf9fa..db3684155e 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 = {} }; |