authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-04-18 21:25:03-04:00
committergravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2023-04-20 20:49:35+01:00
log06992e159b94a5d44f74f8e0a586b13fa7b0416e
treebb74ce588f6ac2d601941bb37a7b6259f2e24ffd
parent9f1409cabc6545d977defa4f22967eb5f1a202a0
signature Commit is signed but in an unrecognized format.

x86_64: fix merge conflict

1 files changed, 5 insertions(+), 2 deletions(-)

src/arch/x86_64/CodeGen.zig+5-2
......@@ -222,8 +222,11 @@ const InstTracking = struct {
222222 .undef,
223223 .immediate,
224224 .memory,
225 .linker_load,
226 .tlv_reloc,
225 .load_direct,
226 .lea_direct,
227 .load_got,
228 .load_tlv,
229 .lea_tlv,
227230 .ptr_stack_offset,
228231 => return, // these can be rematerialized without using a stack slot
229232 }