| author |  Jacob Young <jacobly@ziglang.org> 2023-03-14 22:32:00-04:00 |
| committer | Jacob Young <jacobly@ziglang.org> 2023-03-15 01:04:21-04:00 |
| log | 05b12e677939effa9da147008071908a2a93fe35 |
| tree | a69dba305e556a4e469a247a514964503f98440d |
| parent | 238615984064f52b6ff31b5750824a9c764fdb15 |
x86_64: handle duplicate prong deaths
4 files changed, 6 insertions(+), 11 deletions(-)
src
arch
x86_64
test
src/arch/x86_64/CodeGen.zig+6-7
| ... | ... | @@ -1037,9 +1037,9 @@ fn genBody(self: *Self, body: []const Air.Inst.Index) InnerError!void { |
| 1037 | 1037 | fn processDeath(self: *Self, inst: Air.Inst.Index) void { |
| 1038 | 1038 | const air_tags = self.air.instructions.items(.tag); |
| 1039 | 1039 | if (air_tags[inst] == .constant) return; // Constants are immortal. |
| 1040 | const prev_value = self.getResolvedInstValue(inst) orelse return; | |
| 1040 | 1041 | log.debug("%{d} => {}", .{ inst, MCValue.dead }); |
| 1041 | 1042 | // When editing this function, note that the logic must synchronize with `reuseOperand`. |
| 1042 | const prev_value = self.getResolvedInstValue(inst); | |
| 1043 | 1043 | const branch = &self.branch_stack.items[self.branch_stack.items.len - 1]; |
| 1044 | 1044 | branch.inst_table.putAssumeCapacity(inst, .dead); |
| 1045 | 1045 | switch (prev_value) { |
| ... | ... | @@ -1225,7 +1225,7 @@ fn revertState(self: *Self, state: State) void { |
| 1225 | 1225 | pub fn spillInstruction(self: *Self, reg: Register, inst: Air.Inst.Index) !void { |
| 1226 | 1226 | const stack_mcv = try self.allocRegOrMem(inst, false); |
| 1227 | 1227 | log.debug("spilling %{d} to stack mcv {any}", .{ inst, stack_mcv }); |
| 1228 | const reg_mcv = self.getResolvedInstValue(inst); | |
| 1228 | const reg_mcv = self.getResolvedInstValue(inst).?; | |
| 1229 | 1229 | switch (reg_mcv) { |
| 1230 | 1230 | .register => |other| { |
| 1231 | 1231 | assert(reg.to64() == other.to64()); |
| ... | ... | @@ -1242,7 +1242,7 @@ pub fn spillInstruction(self: *Self, reg: Register, inst: Air.Inst.Index) !void |
| 1242 | 1242 | |
| 1243 | 1243 | pub fn spillEflagsIfOccupied(self: *Self) !void { |
| 1244 | 1244 | if (self.eflags_inst) |inst_to_save| { |
| 1245 | const mcv = self.getResolvedInstValue(inst_to_save); | |
| 1245 | const mcv = self.getResolvedInstValue(inst_to_save).?; | |
| 1246 | 1246 | const new_mcv = switch (mcv) { |
| 1247 | 1247 | .register_overflow => try self.allocRegOrMem(inst_to_save, false), |
| 1248 | 1248 | .eflags => try self.allocRegOrMem(inst_to_save, true), |
| ... | ... | @@ -6315,18 +6315,17 @@ fn resolveInst(self: *Self, inst: Air.Inst.Ref) InnerError!MCValue { |
| 6315 | 6315 | return gop.value_ptr.*; |
| 6316 | 6316 | }, |
| 6317 | 6317 | .const_ty => unreachable, |
| 6318 | else => return self.getResolvedInstValue(inst_index), | |
| 6318 | else => return self.getResolvedInstValue(inst_index).?, | |
| 6319 | 6319 | } |
| 6320 | 6320 | } |
| 6321 | 6321 | |
| 6322 | fn getResolvedInstValue(self: *Self, inst: Air.Inst.Index) MCValue { | |
| 6322 | fn getResolvedInstValue(self: *Self, inst: Air.Inst.Index) ?MCValue { | |
| 6323 | 6323 | // Treat each stack item as a "layer" on top of the previous one. |
| 6324 | 6324 | var i: usize = self.branch_stack.items.len; |
| 6325 | 6325 | while (true) { |
| 6326 | 6326 | i -= 1; |
| 6327 | 6327 | if (self.branch_stack.items[i].inst_table.get(inst)) |mcv| { |
| 6328 | assert(mcv != .dead); | |
| 6329 | return mcv; | |
| 6328 | return if (mcv != .dead) mcv else null; | |
| 6330 | 6329 | } |
| 6331 | 6330 | } |
| 6332 | 6331 | } |
test/behavior/inline_switch.zig-1
| ... | ... | @@ -46,7 +46,6 @@ const U = union(E) { a: void, b: u2, c: u3, d: u4 }; |
| 46 | 46 | test "inline switch unions" { |
| 47 | 47 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO |
| 48 | 48 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 49 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO | |
| 50 | 49 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| 51 | 50 | |
| 52 | 51 | var x: U = .a; |
test/behavior/union.zig-2
| ... | ... | @@ -214,7 +214,6 @@ const Payload = union(Letter) { |
| 214 | 214 | }; |
| 215 | 215 | |
| 216 | 216 | test "union with specified enum tag" { |
| 217 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; | |
| 218 | 217 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; |
| 219 | 218 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; |
| 220 | 219 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
| ... | ... | @@ -224,7 +223,6 @@ test "union with specified enum tag" { |
| 224 | 223 | } |
| 225 | 224 | |
| 226 | 225 | test "packed union generates correctly aligned type" { |
| 227 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; | |
| 228 | 226 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; |
| 229 | 227 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; |
| 230 | 228 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |
test/behavior/union_with_members.zig-1
| ... | ... | @@ -18,7 +18,6 @@ const ET = union(enum) { |
| 18 | 18 | |
| 19 | 19 | test "enum with members" { |
| 20 | 20 | if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO |
| 21 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO | |
| 22 | 21 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 23 | 22 | if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO |
| 24 | 23 | if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO |