diff options
Diffstat (limited to 'src/link/Elf')
| -rw-r--r-- | src/link/Elf/ZigObject.zig | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/link/Elf/ZigObject.zig b/src/link/Elf/ZigObject.zig index a7a758b5c4..3eff58af73 100644 --- a/src/link/Elf/ZigObject.zig +++ b/src/link/Elf/ZigObject.zig @@ -1382,8 +1382,8 @@ fn updateLazySymbol( sym: link.File.LazySymbol, symbol_index: Symbol.Index, ) !void { - const mod = pt.zcu; - const gpa = mod.gpa; + const zcu = pt.zcu; + const gpa = zcu.gpa; var required_alignment: InternPool.Alignment = .none; var code_buffer = std.ArrayList(u8).init(gpa); @@ -1398,7 +1398,7 @@ fn updateLazySymbol( break :blk try self.strtab.insert(gpa, name); }; - const src = Type.fromInterned(sym.ty).srcLocOrNull(mod) orelse Zcu.LazySrcLoc.unneeded; + const src = Type.fromInterned(sym.ty).srcLocOrNull(zcu) orelse Zcu.LazySrcLoc.unneeded; const res = try codegen.generateLazySymbol( &elf_file.base, pt, @@ -1513,7 +1513,7 @@ pub fn updateExports( const tracy = trace(@src()); defer tracy.end(); - const mod = pt.zcu; + const zcu = pt.zcu; const gpa = elf_file.base.comp.gpa; const metadata = switch (exported) { .nav => |nav| blk: { @@ -1521,15 +1521,15 @@ pub fn updateExports( break :blk self.navs.getPtr(nav).?; }, .uav => |uav| self.uavs.getPtr(uav) orelse blk: { - const first_exp = mod.all_exports.items[export_indices[0]]; + const first_exp = zcu.all_exports.items[export_indices[0]]; const res = try self.lowerUav(elf_file, pt, uav, .none, first_exp.src); switch (res) { .mcv => {}, .fail => |em| { // TODO maybe it's enough to return an error here and let Zcu.processExportsInner // handle the error? - try mod.failed_exports.ensureUnusedCapacity(mod.gpa, 1); - mod.failed_exports.putAssumeCapacityNoClobber(export_indices[0], em); + try zcu.failed_exports.ensureUnusedCapacity(zcu.gpa, 1); + zcu.failed_exports.putAssumeCapacityNoClobber(export_indices[0], em); return; }, } @@ -1542,11 +1542,11 @@ pub fn updateExports( const esym_shndx = self.symtab.items(.shndx)[esym_index]; for (export_indices) |export_idx| { - const exp = mod.all_exports.items[export_idx]; + const exp = zcu.all_exports.items[export_idx]; if (exp.opts.section.unwrap()) |section_name| { - if (!section_name.eqlSlice(".text", &mod.intern_pool)) { - try mod.failed_exports.ensureUnusedCapacity(mod.gpa, 1); - mod.failed_exports.putAssumeCapacityNoClobber(export_idx, try Zcu.ErrorMsg.create( + if (!section_name.eqlSlice(".text", &zcu.intern_pool)) { + try zcu.failed_exports.ensureUnusedCapacity(zcu.gpa, 1); + zcu.failed_exports.putAssumeCapacityNoClobber(export_idx, try Zcu.ErrorMsg.create( gpa, exp.src, "Unimplemented: ExportOptions.section", @@ -1560,8 +1560,8 @@ pub fn updateExports( .strong => elf.STB_GLOBAL, .weak => elf.STB_WEAK, .link_once => { - try mod.failed_exports.ensureUnusedCapacity(mod.gpa, 1); - mod.failed_exports.putAssumeCapacityNoClobber(export_idx, try Zcu.ErrorMsg.create( + try zcu.failed_exports.ensureUnusedCapacity(zcu.gpa, 1); + zcu.failed_exports.putAssumeCapacityNoClobber(export_idx, try Zcu.ErrorMsg.create( gpa, exp.src, "Unimplemented: GlobalLinkage.LinkOnce", @@ -1571,7 +1571,7 @@ pub fn updateExports( }, }; const stt_bits: u8 = @as(u4, @truncate(esym.st_info)); - const exp_name = exp.opts.name.toSlice(&mod.intern_pool); + const exp_name = exp.opts.name.toSlice(&zcu.intern_pool); const name_off = try self.strtab.insert(gpa, exp_name); const global_sym_index = if (metadata.@"export"(self, exp_name)) |exp_index| exp_index.* @@ -1626,8 +1626,8 @@ pub fn deleteExport( .nav => |nav| self.navs.getPtr(nav), .uav => |uav| self.uavs.getPtr(uav), } orelse return; - const mod = elf_file.base.comp.zcu.?; - const exp_name = name.toSlice(&mod.intern_pool); + const zcu = elf_file.base.comp.zcu.?; + const exp_name = name.toSlice(&zcu.intern_pool); const esym_index = metadata.@"export"(self, exp_name) orelse return; log.debug("deleting export '{s}'", .{exp_name}); const esym = &self.symtab.items(.elf_sym)[esym_index.*]; |