mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: fix bug when freeing Decl

Browse Source 
Take into account that an already freed Decl will no longer be
available as `decl.link.macho` causing a potential "inactive union field"
panic.
This commit is contained in:
Jakub Konka 2021-07-21 23:38:20 +02:00
parent e05b1e0e07
commit d0edd37f69
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/link/MachO.zig
View File

@ -197,11 +197,11 @@ managed_blocks: std.ArrayListUnmanaged(*TextBlock) = .{},
blocks: std.AutoHashMapUnmanaged(MatchingSection, *TextBlock) = .{}, blocks: std.AutoHashMapUnmanaged(MatchingSection, *TextBlock) = .{},
/// List of Decls that are currently alive. /// Table of Decls that are currently alive.
/// We store them here so that we can properly dispose of any allocated /// We store them here so that we can properly dispose of any allocated
/// memory within the TextBlock in the incremental linker. /// memory within the TextBlock in the incremental linker.
/// TODO consolidate this. /// TODO consolidate this.
decls: std.ArrayListUnmanaged(*Module.Decl) = .{}, decls: std.AutoArrayHashMapUnmanaged(*Module.Decl, void) = .{},
/// Currently active Module.Decl. /// Currently active Module.Decl.
/// TODO this might not be necessary if we figure out how to pass Module.Decl instance /// TODO this might not be necessary if we figure out how to pass Module.Decl instance
@ -3323,7 +3323,7 @@ pub fn deinit(self: *MachO) void {
self.blocks.deinit(self.base.allocator); self.blocks.deinit(self.base.allocator);
self.text_block_free_list.deinit(self.base.allocator); self.text_block_free_list.deinit(self.base.allocator);
for (self.decls.items) |decl| { for (self.decls.keys()) |decl| {
decl.link.macho.deinit(self.base.allocator); decl.link.macho.deinit(self.base.allocator);
} }
self.decls.deinit(self.base.allocator); self.decls.deinit(self.base.allocator);
@ -3427,9 +3427,8 @@ pub fn allocateDeclIndexes(self: *MachO, decl: *Module.Decl) !void {
try self.locals.ensureUnusedCapacity(self.base.allocator, 1); try self.locals.ensureUnusedCapacity(self.base.allocator, 1);
try self.got_entries.ensureUnusedCapacity(self.base.allocator, 1); try self.got_entries.ensureUnusedCapacity(self.base.allocator, 1);
try self.decls.ensureUnusedCapacity(self.base.allocator, 1);
self.decls.appendAssumeCapacity(decl); try self.decls.putNoClobber(self.base.allocator, decl, {});
if (self.locals_free_list.popOrNull()) |i| { if (self.locals_free_list.popOrNull()) |i| {
log.debug("reusing symbol index {d} for {s}", .{ i, decl.name }); log.debug("reusing symbol index {d} for {s}", .{ i, decl.name });
@ -3598,6 +3597,9 @@ pub fn updateDecl(self: *MachO, module: *Module, decl: *Module.Decl) !void {
// Resolve relocations // Resolve relocations
try decl.link.macho.resolveRelocs(self); try decl.link.macho.resolveRelocs(self);
// TODO this requires further investigation: should we dispose of resolved relocs, or keep them
// so that we can reapply them when moving/growing sections?
decl.link.macho.relocs.clearRetainingCapacity();
// Apply pending updates // Apply pending updates
while (self.pending_updates.popOrNull()) |update| { while (self.pending_updates.popOrNull()) |update| {
@ -3746,6 +3748,7 @@ pub fn deleteExport(self: *MachO, exp: Export) void {
pub fn freeDecl(self: *MachO, decl: *Module.Decl) void { pub fn freeDecl(self: *MachO, decl: *Module.Decl) void {
log.debug("freeDecl {*}", .{decl}); log.debug("freeDecl {*}", .{decl});
_ = self.decls.swapRemove(decl);
// Appending to free lists is allowed to fail because the free lists are heuristics based anyway. // Appending to free lists is allowed to fail because the free lists are heuristics based anyway.
self.freeTextBlock(&decl.link.macho); self.freeTextBlock(&decl.link.macho);
if (decl.link.macho.local_sym_index != 0) { if (decl.link.macho.local_sym_index != 0) {