From 06992e159b94a5d44f74f8e0a586b13fa7b0416e Mon Sep 17 00:00:00 2001
From: Jacob Young <jacobly0@users.noreply.github.com>
Date: Tue, 18 Apr 2023 21:25:03 -0400
Subject: [PATCH] x86_64: fix merge conflict

---
 src/arch/x86_64/CodeGen.zig | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig
index ea25dab9d6..1c72e2296b 100644
--- 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
         }