zig

commit f49aa960a93b401b8e33292cf37a0de1eec312c0 (tree)
parent f01366e8b3ff46831feef2ceb13c5602c0ae3e99
Author: Jakub Konka <kubkon@jakubkonka.com>
Date:   Wed,  4 Aug 2021 10:47:11 +0200

macho: use ArrayHashMap.popOrNull where applicable

Diffstat:
M
src/link/MachO.zig
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
@@ -2329,11 +2329,8 @@ fn resolveSymbols(self: *MachO) !void {
 
     // Convert any tentative definition into a regular symbol and allocate
     // text blocks for each tentative defintion.
-    var tentatives_count: usize = 0;
-    const ntentatives = tentatives.count();
-    while (tentatives_count < ntentatives) : (tentatives_count += 1) {
-        const index = tentatives.pop().key;
-        const sym = &self.globals.items[index];
+    while (tentatives.popOrNull()) |entry| {
+        const sym = &self.globals.items[entry.key];
         const match: MatchingSection = blk: {
             if (self.common_section_index == null) {
                 const data_seg = &self.load_commands.items[self.data_segment_cmd_index.?].Segment;