diff options
| author | Jacob Young <jacobly0@users.noreply.github.com> | 2023-04-18 21:25:03 -0400 |
|---|---|---|
| committer | mlugg <mlugg@mlugg.co.uk> | 2023-04-20 20:49:35 +0100 |
| commit | 06992e159b94a5d44f74f8e0a586b13fa7b0416e (patch) | |
| tree | bb74ce588f6ac2d601941bb37a7b6259f2e24ffd /src | |
| parent | 9f1409cabc6545d977defa4f22967eb5f1a202a0 (diff) | |
| download | zig-06992e159b94a5d44f74f8e0a586b13fa7b0416e.tar.gz zig-06992e159b94a5d44f74f8e0a586b13fa7b0416e.zip | |
x86_64: fix merge conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86_64/CodeGen.zig | 7 |
1 files 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 } |