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

x86_64: fix safety crashes in storeRegs

Browse Source
This commit is contained in:
Jacob Young 2025-09-10 03:10:46 -04:00 committed by Andrew Kelley
parent 0681bf06ab
commit cbbb67c5df
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187019,7 +187019,13 @@ const Temp = struct {
}, },
.struct_type => { .struct_type => {
assert(src_regs.len - part_index == std.math.divCeil(u32, src_abi_size, 8) catch unreachable); assert(src_regs.len - part_index == std.math.divCeil(u32, src_abi_size, 8) catch unreachable);
break :part_ty .u64; break :part_ty switch (src_abi_size) {
0, 3, 5...7 => unreachable,
1 => .u8,
2 => .u16,
4 => .u32,
else => .u64,
};
}, },
.tuple_type => |tuple_type| { .tuple_type => |tuple_type| {
assert(tuple_type.types.len == src_regs.len); assert(tuple_type.types.len == src_regs.len);
@ -187028,10 +187034,6 @@ const Temp = struct {
}; };
const part_size: u31 = @intCast(part_ty.abiSize(zcu)); const part_size: u31 = @intCast(part_ty.abiSize(zcu));
const src_rc = src_reg.class(); const src_rc = src_reg.class();
const part_bit_size = switch (src_rc) {
else => 8 * part_size,
.x87 => part_ty.bitSize(zcu),
};
if (src_rc == .x87 or std.math.isPowerOfTwo(part_size)) { if (src_rc == .x87 or std.math.isPowerOfTwo(part_size)) {
// hack around linker relocation bugs // hack around linker relocation bugs
switch (ptr.tracking(cg).short) { switch (ptr.tracking(cg).short) {
@ -187040,7 +187042,15 @@ const Temp = struct {
} }
const strat = try cg.moveStrategy(part_ty, src_rc, false); const strat = try cg.moveStrategy(part_ty, src_rc, false);
try strat.write(cg, try ptr.tracking(cg).short.deref().mem(cg, .{ try strat.write(cg, try ptr.tracking(cg).short.deref().mem(cg, .{
.size = .fromBitSize(part_bit_size), .size = switch (src_rc) {
else => .fromBitSize(8 * part_size),
.x87 => switch (abi.classifySystemV(src_ty, zcu, cg.target, .other)[part_index]) {
else => unreachable,
.float => .dword,
.float_combine, .sse => .qword,
.x87 => .tbyte,
},
},
.disp = part_disp, .disp = part_disp,
}), registerAlias(src_reg, part_size)); }), registerAlias(src_reg, part_size));
} else { } else {