mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-09 07:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86_64: fix incorrect handling of unreusable operands

Browse Source 
Closes #23448
This commit is contained in:
Jacob Young 2025-04-03 12:09:07 -04:00
parent a2ea4b02bc
commit cac0f56c03
2 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/arch/x86_64/CodeGen.zig
View File

@ -101177,8 +101177,9 @@ const Temp = struct {
const result_temp: Temp = .{ .index = result_temp_index.toIndex() }; const result_temp: Temp = .{ .index = result_temp_index.toIndex() };
assert(cg.reuseTemp(result_temp.index, first_temp.index, first_temp_tracking)); assert(cg.reuseTemp(result_temp.index, first_temp.index, first_temp_tracking));
assert(cg.reuseTemp(result_temp.index, second_temp.index, second_temp_tracking)); assert(cg.reuseTemp(result_temp.index, second_temp.index, second_temp_tracking));
cg.temp_type[@intFromEnum(result_temp_index)] = .slice_const_u8;
result_temp_index.tracking(cg).* = .init(result); result_temp_index.tracking(cg).* = .init(result);
cg.temp_type[@intFromEnum(result_temp_index)] = .slice_const_u8;
cg.next_temp_index = @enumFromInt(@intFromEnum(result_temp_index) + 1);
first_temp.* = result_temp; first_temp.* = result_temp;
second_temp.* = result_temp; second_temp.* = result_temp;
} }
@ -105837,7 +105838,8 @@ const Temp = struct {
) InnerError!void { ) InnerError!void {
const tomb_bits = cg.liveness.getTombBits(inst); const tomb_bits = cg.liveness.getTombBits(inst);
for (0.., op_refs, op_temps) |op_index, op_ref, op_temp| { for (0.., op_refs, op_temps) |op_index, op_ref, op_temp| {
if (op_temp.index != temp.index) try op_temp.die(cg); if (op_temp.index == temp.index) continue;
if (op_temp.tracking(cg).short != .dead) try op_temp.die(cg);
if (tomb_bits & @as(Liveness.Bpi, 1) << @intCast(op_index) == 0) continue; if (tomb_bits & @as(Liveness.Bpi, 1) << @intCast(op_index) == 0) continue;
if (cg.reused_operands.isSet(op_index)) continue; if (cg.reused_operands.isSet(op_index)) continue;
try cg.processDeath(op_ref.toIndexAllowNone() orelse continue); try cg.processDeath(op_ref.toIndexAllowNone() orelse continue);
@ -105856,6 +105858,12 @@ const Temp = struct {
assert(cg.reuseTemp(inst, temp_index.toIndex(), temp_tracking)); assert(cg.reuseTemp(inst, temp_index.toIndex(), temp_tracking));
}, },
} }
for (0.., op_refs, op_temps) |op_index, op_ref, op_temp| {
if (op_temp.index != temp.index) continue;
if (tomb_bits & @as(Liveness.Bpi, 1) << @intCast(op_index) == 0) continue;
if (cg.reused_operands.isSet(op_index)) continue;
try cg.processDeath(op_ref.toIndexAllowNone() orelse continue);
}
} }
fn die(temp: Temp, cg: *CodeGen) InnerError!void { fn die(temp: Temp, cg: *CodeGen) InnerError!void {
@ -105881,7 +105889,8 @@ const Temp = struct {
} }
fn isValid(index: Index, cg: *CodeGen) bool { fn isValid(index: Index, cg: *CodeGen) bool {
return index.tracking(cg).short != .dead; return @intFromEnum(index) < @intFromEnum(cg.next_temp_index) and
index.tracking(cg).short != .dead;
} }
fn typeOf(index: Index, cg: *CodeGen) Type { fn typeOf(index: Index, cg: *CodeGen) Type {

44
test/behavior/struct.zig
View File

@ -1529,7 +1529,7 @@ test "optional generic function label struct field" {
} }
test "struct fields get automatically reordered" { test "struct fields get automatically reordered" {
if (builtin.zig_backend != .stage2_llvm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
const S1 = struct { const S1 = struct {
a: u32, a: u32,
@ -2140,3 +2140,45 @@ test "anonymous struct equivalence" {
comptime assert(A != C); comptime assert(A != C);
comptime assert(B != C); comptime assert(B != C);
} }
test "field access through mem ptr arg" {
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
const S = struct {
fn nestedFieldAccess(
_: usize,
_: usize,
_: usize,
_: usize,
_: usize,
_: usize,
_: usize,
_: usize,
ptr_struct: *const struct { field: u32 },
) u32 {
return ptr_struct.field;
}
};
try expect(S.nestedFieldAccess(
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
&.{ .field = 0x6b00a2eb },
) == 0x6b00a2eb);
comptime assert(S.nestedFieldAccess(
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
undefined,
&.{ .field = 0x0ced271f },
) == 0x0ced271f);
}