From d0dc622638716583eb4d9de78dfc87bef7969bc0 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Wed, 1 Sep 2021 00:01:57 +0200
Subject: [PATCH] macho: do not reset section's size after allocating atom

---
 src/link/MachO.zig          | 12 ------------
 src/link/MachO/commands.zig |  8 ++++----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index 38446db5a6..b320202fe1 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -1950,8 +1950,6 @@ pub fn allocateAtom(self: *MachO, atom: *TextBlock, match: MatchingSection) !u64
             break :blk end_addr;
         };
         assert(needed_size <= end_addr); // TODO must expand the section
-        sect.size = needed_size;
-        self.load_commands_dirty = true;
     }
     const n_sect = @intCast(u8, self.section_ordinals.getIndex(match).? + 1);
     sym.n_value = vaddr;
@@ -4599,17 +4597,7 @@ fn allocateTextBlock(self: *MachO, text_block: *TextBlock, new_block_size: u64,
     if (expand_text_section) {
         const needed_size = (vaddr + new_block_size) - text_section.addr;
         assert(needed_size <= text_segment.inner.filesize); // TODO must move the entire text section.
-
         _ = try self.blocks.put(self.base.allocator, match, text_block);
-        text_section.size = needed_size;
-        self.load_commands_dirty = true; // TODO Make more granular.
-
-        if (self.d_sym) |*ds| {
-            const debug_text_seg = &ds.load_commands.items[ds.text_segment_cmd_index.?].Segment;
-            const debug_text_sect = &debug_text_seg.sections.items[ds.text_section_index.?];
-            debug_text_sect.size = needed_size;
-            ds.load_commands_dirty = true;
-        }
     }
     text_block.size = new_block_size;
 
diff --git a/src/link/MachO/commands.zig b/src/link/MachO/commands.zig
index 25154e2d5b..ff7c5e841b 100644
--- a/src/link/MachO/commands.zig
+++ b/src/link/MachO/commands.zig
@@ -270,11 +270,11 @@ pub const SegmentCommand = struct {
     }
 
     pub fn findFreeSpace(self: SegmentCommand, object_size: u64, min_alignment: u32, start: ?u64) u64 {
-        var st: u64 = if (start) |v| v else self.inner.fileoff;
-        while (self.detectAllocCollision(st, object_size)) |item_end| {
-            st = mem.alignForwardGeneric(u64, item_end, min_alignment);
+        var offset: u64 = if (start) |v| v else self.inner.fileoff;
+        while (self.detectAllocCollision(offset, object_size)) |item_end| {
+            offset = mem.alignForwardGeneric(u64, item_end, min_alignment);
         }
-        return st;
+        return offset;
     }
 
     fn eql(self: SegmentCommand, other: SegmentCommand) bool {