authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-07-15 20:59:39+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-07-22 16:58:20+02:00
logb380ed6a729d7f0daa6f0ee2b58bf3b54017cc65
tree5bdf617ec7c7705c2242a493a60c7e54b4db7a1e
parent817939d20a097c195fc924398081e64556cc0aea

macho: deallocate globals keys


1 files changed, 47 insertions(+), 41 deletions(-)

src/link/MachO.zig+47-41
......@@ -3279,71 +3279,77 @@ fn setEntryPoint(self: *MachO) !void {
32793279}
32803280
32813281pub fn deinit(self: *MachO) void {
3282 const gpa = self.base.allocator;
3283
32823284 if (build_options.have_llvm) {
3283 if (self.llvm_object) |llvm_object| llvm_object.destroy(self.base.allocator);
3285 if (self.llvm_object) |llvm_object| llvm_object.destroy(gpa);
32843286 }
32853287
32863288 if (self.d_sym) |*d_sym| {
3287 d_sym.deinit(self.base.allocator);
3288 }
3289
3290 self.section_ordinals.deinit(self.base.allocator);
3291 self.tlv_ptr_entries.deinit(self.base.allocator);
3292 self.tlv_ptr_entries_free_list.deinit(self.base.allocator);
3293 self.tlv_ptr_entries_table.deinit(self.base.allocator);
3294 self.got_entries.deinit(self.base.allocator);
3295 self.got_entries_free_list.deinit(self.base.allocator);
3296 self.got_entries_table.deinit(self.base.allocator);
3297 self.stubs.deinit(self.base.allocator);
3298 self.stubs_free_list.deinit(self.base.allocator);
3299 self.stubs_table.deinit(self.base.allocator);
3300 self.strtab.deinit(self.base.allocator);
3301 self.globals.deinit(self.base.allocator);
3302 self.locals.deinit(self.base.allocator);
3303 self.locals_free_list.deinit(self.base.allocator);
3304 self.unresolved.deinit(self.base.allocator);
3289 d_sym.deinit(gpa);
3290 }
3291
3292 self.section_ordinals.deinit(gpa);
3293 self.tlv_ptr_entries.deinit(gpa);
3294 self.tlv_ptr_entries_free_list.deinit(gpa);
3295 self.tlv_ptr_entries_table.deinit(gpa);
3296 self.got_entries.deinit(gpa);
3297 self.got_entries_free_list.deinit(gpa);
3298 self.got_entries_table.deinit(gpa);
3299 self.stubs.deinit(gpa);
3300 self.stubs_free_list.deinit(gpa);
3301 self.stubs_table.deinit(gpa);
3302 self.strtab.deinit(gpa);
3303 self.locals.deinit(gpa);
3304 self.locals_free_list.deinit(gpa);
3305 self.unresolved.deinit(gpa);
3306
3307 for (self.globals.keys()) |key| {
3308 gpa.free(key);
3309 }
3310 self.globals.deinit(gpa);
33053311
33063312 for (self.objects.items) |*object| {
3307 object.deinit(self.base.allocator);
3313 object.deinit(gpa);
33083314 }
3309 self.objects.deinit(self.base.allocator);
3315 self.objects.deinit(gpa);
33103316
33113317 for (self.archives.items) |*archive| {
3312 archive.deinit(self.base.allocator);
3318 archive.deinit(gpa);
33133319 }
3314 self.archives.deinit(self.base.allocator);
3320 self.archives.deinit(gpa);
33153321
33163322 for (self.dylibs.items) |*dylib| {
3317 dylib.deinit(self.base.allocator);
3323 dylib.deinit(gpa);
33183324 }
3319 self.dylibs.deinit(self.base.allocator);
3320 self.dylibs_map.deinit(self.base.allocator);
3321 self.referenced_dylibs.deinit(self.base.allocator);
3325 self.dylibs.deinit(gpa);
3326 self.dylibs_map.deinit(gpa);
3327 self.referenced_dylibs.deinit(gpa);
33223328
33233329 for (self.load_commands.items) |*lc| {
3324 lc.deinit(self.base.allocator);
3330 lc.deinit(gpa);
33253331 }
3326 self.load_commands.deinit(self.base.allocator);
3332 self.load_commands.deinit(gpa);
33273333
33283334 for (self.managed_atoms.items) |atom| {
3329 atom.deinit(self.base.allocator);
3330 self.base.allocator.destroy(atom);
3335 atom.deinit(gpa);
3336 gpa.destroy(atom);
33313337 }
3332 self.managed_atoms.deinit(self.base.allocator);
3333 self.atoms.deinit(self.base.allocator);
3338 self.managed_atoms.deinit(gpa);
3339 self.atoms.deinit(gpa);
33343340 {
33353341 var it = self.atom_free_lists.valueIterator();
33363342 while (it.next()) |free_list| {
3337 free_list.deinit(self.base.allocator);
3343 free_list.deinit(gpa);
33383344 }
3339 self.atom_free_lists.deinit(self.base.allocator);
3345 self.atom_free_lists.deinit(gpa);
33403346 }
33413347 if (self.base.options.module) |mod| {
33423348 for (self.decls.keys()) |decl_index| {
33433349 const decl = mod.declPtr(decl_index);
3344 decl.link.macho.deinit(self.base.allocator);
3350 decl.link.macho.deinit(gpa);
33453351 }
3346 self.decls.deinit(self.base.allocator);
3352 self.decls.deinit(gpa);
33473353 } else {
33483354 assert(self.decls.count() == 0);
33493355 }
......@@ -3351,15 +3357,15 @@ pub fn deinit(self: *MachO) void {
33513357 {
33523358 var it = self.unnamed_const_atoms.valueIterator();
33533359 while (it.next()) |atoms| {
3354 atoms.deinit(self.base.allocator);
3360 atoms.deinit(gpa);
33553361 }
3356 self.unnamed_const_atoms.deinit(self.base.allocator);
3362 self.unnamed_const_atoms.deinit(gpa);
33573363 }
33583364
3359 self.atom_by_index_table.deinit(self.base.allocator);
3365 self.atom_by_index_table.deinit(gpa);
33603366
33613367 if (self.code_signature) |*csig| {
3362 csig.deinit(self.base.allocator);
3368 csig.deinit(gpa);
33633369 }
33643370}
33653371