diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-12-15 12:47:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-15 12:47:11 -0800 |
| commit | e45680cab5e9f5b28fd73ab58dae0c0f487fca48 (patch) | |
| tree | 7d95a4a0460ab19d64e80ef64340fda519e4558b /src | |
| parent | 09f70bdd91bf498644f7a42800f3e4e4df7040aa (diff) | |
| parent | 04784463772decb18d70734747d3fc89c043b979 (diff) | |
| download | zig-e45680cab5e9f5b28fd73ab58dae0c0f487fca48.tar.gz zig-e45680cab5e9f5b28fd73ab58dae0c0f487fca48.zip | |
Merge pull request #10341 from ziglang/stage2-tests
stage2: refactor x86_64 and macOS tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86_64/CodeGen.zig | 8 | ||||
| -rw-r--r-- | src/link/MachO.zig | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index 4580395fd8..378184f70a 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -1635,7 +1635,7 @@ fn genBinMathOpMir( .tag = mir_tag, .ops = (Mir.Ops{ .reg1 = registerAlias(dst_reg, @intCast(u32, abi_size)), - .reg2 = .ebp, + .reg2 = registerAlias(.rbp, @intCast(u32, abi_size)), .flags = 0b01, }).encode(), .data = .{ .imm = -@intCast(i32, adj_off) }, @@ -1666,7 +1666,7 @@ fn genBinMathOpMir( .tag = mir_tag, .ops = (Mir.Ops{ .reg1 = registerAlias(src_reg, @intCast(u32, abi_size)), - .reg2 = .ebp, + .reg2 = registerAlias(.rbp, @intCast(u32, abi_size)), .flags = 0b10, }).encode(), .data = .{ .imm = -@intCast(i32, adj_off) }, @@ -2839,7 +2839,7 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro .tag = .mov, .ops = (Mir.Ops{ .reg1 = registerAlias(reg, @intCast(u32, abi_size)), - .reg2 = .ebp, + .reg2 = registerAlias(.rbp, @intCast(u32, abi_size)), .flags = 0b10, }).encode(), .data = .{ .imm = -@intCast(i32, adj_off) }, @@ -3060,7 +3060,7 @@ fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void .tag = .mov, .ops = (Mir.Ops{ .reg1 = registerAlias(reg, @intCast(u32, abi_size)), - .reg2 = .ebp, + .reg2 = registerAlias(.rbp, @intCast(u32, abi_size)), .flags = 0b01, }).encode(), .data = .{ .imm = ioff }, diff --git a/src/link/MachO.zig b/src/link/MachO.zig index d7457ec549..efc1330597 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -4823,8 +4823,7 @@ fn allocateAtom(self: *MachO, atom: *Atom, new_atom_size: u64, alignment: u64, m // should be deleted because the atom that it points to has grown to take up // more of the extra capacity. if (!big_atom.freeListEligible(self.*)) { - const bl = free_list.swapRemove(i); - bl.deinit(self.base.allocator); + _ = free_list.swapRemove(i); } else { i += 1; } |