Commit f4a31bed98c5ee65c0e8494e0e0e15e418697cb8 | zig

author	Jacob Young <jacobly@ziglang.org> 2025-03-26 22:50:22-04:00
committer	Jacob Young <jacobly@ziglang.org> 2025-04-10 02:04:52-04:00
log	f4a31bed98c5ee65c0e8494e0e0e15e418697cb8
tree	e9e38dbcef024e6a74115ddcde53c7b3570db379
parent	1eb5d70d1261be143a5f3c1a73ea23335d8c0df6

x86_64: remove broken const value tracking

1 files changed, 27 insertions(+), 36 deletions(-)

src
- arch
  - x86_64
    CodeGen.zig

src/arch/x86_64/CodeGen.zig+27-36

 @@ -83,7 +83,6 @@ end_di_column: u32,
 epilogue_relocs: std.ArrayListUnmanaged(Mir.Inst.Index) = .empty,
 reused_operands: std.StaticBitSet(Liveness.bpi - 1) = undefined,
-const_tracking: ConstTrackingMap = .empty,
 inst_tracking: InstTrackingMap = .empty,
 // Key is the block instruction
 @@ -926,7 +925,6 @@ pub fn generate(
         while (block_it.next()) |block| block.deinit(gpa);
         function.blocks.deinit(gpa);
         function.inst_tracking.deinit(gpa);
-        function.const_tracking.deinit(gpa);
         function.epilogue_relocs.deinit(gpa);
         function.mir_instructions.deinit(gpa);
         function.mir_extra.deinit(gpa);
 @@ -108991,40 +108989,35 @@ fn resolveInst(self: *CodeGen, ref: Air.Inst.Ref) InnerError!MCValue {
     // If the type has no codegen bits, no need to store it.
     if (!ty.hasRuntimeBitsIgnoreComptime(zcu)) return .none;
-    const mcv = if (ref.toIndex()) |inst| mcv: {
+    const mcv: MCValue = if (ref.toIndex()) |inst| mcv: {
         break :mcv self.inst_tracking.getPtr(inst).?.short;
     } else mcv: {
-        const ip_index = ref.toInterned().?;
+        const const_mcv = try self.genTypedValue(.fromInterned(ref.toInterned().?));
-        const gop = try self.const_tracking.getOrPut(self.gpa, ip_index);
+        switch (const_mcv) {
-        if (!gop.found_existing) gop.value_ptr.* = .init(init: {
+            .lea_tlv => |tlv_sym| switch (self.bin_file.tag) {
-            const const_mcv = try self.genTypedValue(.fromInterned(ip_index));
+                .elf, .macho => {
-            switch (const_mcv) {
+                    if (self.mod.pic) {
-                .lea_tlv => |tlv_sym| switch (self.bin_file.tag) {
+                        try self.spillRegisters(&.{ .rdi, .rax });
-                    .elf, .macho => {
+                    } else {
-                        if (self.mod.pic) {
+                        try self.spillRegisters(&.{.rax});
-                            try self.spillRegisters(&.{ .rdi, .rax });
+                    }
-                        } else {
+                    const frame_index = try self.allocFrameIndex(.init(.{
-                            try self.spillRegisters(&.{.rax});
+                        .size = 8,
-                        }
+                        .alignment = .@"8",
-                        const frame_index = try self.allocFrameIndex(.init(.{
+                    }));
-                            .size = 8,
+                    try self.genSetMem(
-                            .alignment = .@"8",
+                        .{ .frame = frame_index },
-                        }));
+                        0,
-                        try self.genSetMem(
+                        .usize,
-                            .{ .frame = frame_index },
+                        .{ .lea_symbol = .{ .sym_index = tlv_sym } },
-                            0,
+                        .{},
-                            .usize,
+                    );
-                            .{ .lea_symbol = .{ .sym_index = tlv_sym } },
+                    break :mcv .{ .load_frame = .{ .index = frame_index } };
-                            .{},
-                        );
-                        break :init .{ .load_frame = .{ .index = frame_index } };
-                    },
-                    else => break :init const_mcv,
                 },
-                else => break :init const_mcv,
+                else => break :mcv const_mcv,
-            }
+            },
-        });
+            else => break :mcv const_mcv,
-        break :mcv gop.value_ptr.short;
+        }
     };
     switch (mcv) {
 @@ -115260,8 +115253,7 @@ fn tempFromOperand(cg: *CodeGen, op_ref: Air.Inst.Ref, op_dies: bool) InnerError
     if (op_ref.toIndex()) |op_inst| return .{ .index = op_inst };
     const val = op_ref.toInterned().?;
-    const gop = try cg.const_tracking.getOrPut(cg.gpa, val);
+    return cg.tempInit(.fromInterned(ip.typeOf(val)), init: {
-    if (!gop.found_existing) gop.value_ptr.* = .init(init: {
         const const_mcv = try cg.genTypedValue(.fromInterned(val));
         switch (const_mcv) {
             .lea_tlv => |tlv_sym| switch (cg.bin_file.tag) {
 @@ -115289,7 +115281,6 @@ fn tempFromOperand(cg: *CodeGen, op_ref: Air.Inst.Ref, op_dies: bool) InnerError
             else => break :init const_mcv,
         }
     });
-    return cg.tempInit(.fromInterned(ip.typeOf(val)), gop.value_ptr.short);
 }
 fn tempsFromOperandsInner(