mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 12:59:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86_64: fix dst create alloc reg clobbering src

Browse Source 
Closes #24390
This commit is contained in:
Jacob Young 2025-07-26 07:30:56 -04:00
parent 68cfa736df
commit 3194a4d22b
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191920,18 +191920,15 @@ const Select = struct {
error.InvalidInstruction => {
const fixes = @tagName(mir_tag[0]);
const fixes_blank = std.mem.indexOfScalar(u8, fixes, '_').?;
return s.cg.fail(
"invalid instruction: '{s}{s}{s} {s} {s} {s} {s}'",
.{
fixes[0..fixes_blank],
@tagName(mir_tag[1]),
fixes[fixes_blank + 1 ..],
@tagName(mir_ops[0]),
@tagName(mir_ops[1]),
@tagName(mir_ops[2]),
@tagName(mir_ops[3]),
},
);
return s.cg.fail("invalid instruction: '{s}{s}{s} {s} {s} {s} {s}'", .{
fixes[0..fixes_blank],
@tagName(mir_tag[1]),
fixes[fixes_blank + 1 ..],
@tagName(mir_ops[0]),
@tagName(mir_ops[1]),
@tagName(mir_ops[2]),
@tagName(mir_ops[3]),
});
},
else => |e| return e,
};
@ -194423,6 +194420,18 @@ fn select(
while (true) for (pattern.src[0..src_temps.len], src_temps) |src_pattern, *src_temp| {
if (try src_pattern.convert(src_temp, cg)) break;
} else break;
var src_locks: [s_src_temps.len][2]?RegisterLock = @splat(@splat(null));
for (src_locks[0..src_temps.len], src_temps) |*locks, src_temp| {
const regs: [2]Register = switch (src_temp.tracking(cg).short) {
else => continue,
.register => |reg| .{ reg, .none },
.register_pair => |regs| regs,
};
for (regs, locks) |reg, *lock| {
if (reg == .none) continue;
lock.* = cg.register_manager.lockRegIndex(RegisterManager.indexOfRegIntoTracked(reg) orelse continue);
}
}
@memcpy(s_src_temps[0..src_temps.len], src_temps);
std.mem.swap(Temp, &s_src_temps[pattern.commute[0]], &s_src_temps[pattern.commute[1]]);
@ -194441,6 +194450,7 @@ fn select(
}
assert(s.top == 0);
for (src_locks) |locks| for (locks) |lock| if (lock) |reg| cg.register_manager.unlockReg(reg);
for (tmp_locks) |locks| for (locks) |lock| if (lock) |reg| cg.register_manager.unlockReg(reg);
for (dst_locks) |locks| for (locks) |lock| if (lock) |reg| cg.register_manager.unlockReg(reg);
caller_preserved: {