From 773863150a96fcb9ddb3eccb585d10342d10cb78 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Thu, 22 Jul 2021 14:50:06 +0200 Subject: [PATCH] macho: fix incorrect prealloc in traditional path --- src/link/MachO.zig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/link/MachO.zig b/src/link/MachO.zig index d1d25a313..d742e6ec1 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -425,7 +425,8 @@ pub fn flush(self: *MachO, comp: *Compilation) !void { } } - if (build_options.is_stage1) { + const use_stage1 = build_options.is_stage1 and self.base.options.use_stage1; + if (use_stage1) { return self.linkWithZld(comp); } else { switch (self.base.options.effectiveOutputMode()) { @@ -3153,7 +3154,7 @@ fn writeSymbolTable(self: *MachO) !void { if (object.debug_info == null) continue; // Open scope - try locals.ensureUnusedCapacity(4); + try locals.ensureUnusedCapacity(3); locals.appendAssumeCapacity(.{ .n_strx = try self.makeString(object.tu_comp_dir.?), .n_type = macho.N_SO, @@ -3192,7 +3193,7 @@ fn writeSymbolTable(self: *MachO) !void { } // Close scope - locals.appendAssumeCapacity(.{ + try locals.append(.{ .n_strx = 0, .n_type = macho.N_SO, .n_sect = 0,