x86_64: fix merge conflict

2026-02-12 20:37:54 +00:00 · 2023-04-18 21:25:03 -04:00 · 2023-04-18 21:25:03 -04:00 · 06992e159b
commit 06992e159b
parent 9f1409cabc
1 changed files with 5 additions and 2 deletions
--- a/src/arch/x86_64/CodeGen.zig
+++ b/src/arch/x86_64/CodeGen.zig
@ -222,8 +222,11 @@ const InstTracking = struct {
            .undef,
            .immediate,
            .memory,
-            .linker_load,
-            .tlv_reloc,
+            .load_direct,
+            .lea_direct,
+            .load_got,
+            .load_tlv,
+            .lea_tlv,
            .ptr_stack_offset,
            => return, // these can be rematerialized without using a stack slot
        }