authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2025-06-04 01:42:40-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-06-06 23:42:14-07:00
log5986bdf868a58cdef2adf58ff27b6526eafd99fe
tree5310161f00ef5adaa1baf62bac4d4ba646f26ab2
parente96d86064eb81977f254fa8f36481b7d150cb3b6

Compilation: enable the x86_64 backend by default for debug builds

Closes #22257

15 files changed, 216 insertions(+), 104 deletions(-)

build.zig+2-2
......@@ -437,8 +437,8 @@ pub fn build(b: *std.Build) !void {
437437 .skip_non_native = skip_non_native,
438438 .skip_libc = skip_libc,
439439 .use_llvm = use_llvm,
440 // 2520100864 was observed on an x86_64-linux-gnu host.
441 .max_rss = 2772110950,
440 // 2923515904 was observed on an x86_64-linux-gnu host.
441 .max_rss = 3100000000,
442442 }));
443443
444444 test_modules_step.dependOn(tests.addModuleTests(b, .{
src/Compilation.zig+8-5
......@@ -7225,7 +7225,7 @@ fn buildOutputFromZig(
72257225 assert(out.* == null);
72267226 out.* = crt_file;
72277227
7228 comp.queueLinkTaskMode(crt_file.full_object_path, output_mode);
7228 comp.queueLinkTaskMode(crt_file.full_object_path, &config);
72297229}
72307230
72317231pub const CrtFileOptions = struct {
......@@ -7349,7 +7349,7 @@ pub fn build_crt_file(
73497349 try comp.updateSubCompilation(sub_compilation, misc_task_tag, prog_node);
73507350
73517351 const crt_file = try sub_compilation.toCrtFile();
7352 comp.queueLinkTaskMode(crt_file.full_object_path, output_mode);
7352 comp.queueLinkTaskMode(crt_file.full_object_path, &config);
73537353
73547354 {
73557355 comp.mutex.lock();
......@@ -7359,11 +7359,14 @@ pub fn build_crt_file(
73597359 }
73607360}
73617361
7362pub fn queueLinkTaskMode(comp: *Compilation, path: Cache.Path, output_mode: std.builtin.OutputMode) void {
7363 comp.queueLinkTasks(switch (output_mode) {
7362pub fn queueLinkTaskMode(comp: *Compilation, path: Cache.Path, config: *const Compilation.Config) void {
7363 comp.queueLinkTasks(switch (config.output_mode) {
73647364 .Exe => unreachable,
73657365 .Obj => &.{.{ .load_object = path }},
7366 .Lib => &.{.{ .load_archive = path }},
7366 .Lib => &.{switch (config.link_mode) {
7367 .static => .{ .load_archive = path },
7368 .dynamic => .{ .load_dso = path },
7369 }},
73677370 });
73687371}
73697372
src/Compilation/Config.zig+9-5
......@@ -195,10 +195,7 @@ pub fn resolve(options: Options) ResolveError!Config {
195195 // Note that using the LLVM backend does not necessarily mean using LLVM libraries.
196196 // For example, Zig can emit .bc and .ll files directly, and this is still considered
197197 // using "the LLVM backend".
198 const use_llvm = b: {
199 // If we have no zig code to compile, no need for LLVM.
200 if (!options.have_zcu) break :b false;
201
198 const can_use_llvm = b: {
202199 // If emitting to LLVM bitcode object format, must use LLVM backend.
203200 if (options.emit_llvm_ir or options.emit_llvm_bc) {
204201 if (options.use_llvm == false)
......@@ -237,6 +234,13 @@ pub fn resolve(options: Options) ResolveError!Config {
237234 break :b !target_util.selfHostedBackendIsAsRobustAsLlvm(target);
238235 };
239236
237 const use_llvm = b: {
238 // If we have no zig code to compile, no need for LLVM.
239 if (!options.have_zcu) break :b false;
240
241 break :b can_use_llvm;
242 };
243
240244 if (options.emit_bin and options.have_zcu) {
241245 if (!use_lib_llvm and use_llvm) {
242246 // Explicit request to use LLVM to produce an object file, but without
......@@ -273,7 +277,7 @@ pub fn resolve(options: Options) ResolveError!Config {
273277 }
274278
275279 if (options.use_lld) |x| break :b x;
276 break :b true;
280 break :b can_use_llvm;
277281 };
278282
279283 // Make a decision on whether to use Clang or Aro for translate-c and compiling C files.
src/arch/x86_64/Emit.zig+5-5
......@@ -378,9 +378,9 @@ pub fn emitMir(emit: *Emit) Error!void {
378378 };
379379 break :stack_value &loc_buf[0];
380380 } } },
381 .pseudo_dbg_local_as => .{ mir_inst.data.as.air_inst, .{ .addr = .{
382 .sym = mir_inst.data.as.sym_index,
383 } } },
381 .pseudo_dbg_local_as => .{ mir_inst.data.as.air_inst, .{
382 .addr_reloc = mir_inst.data.as.sym_index,
383 } },
384384 .pseudo_dbg_local_aso => loc: {
385385 const sym_off = emit.lower.mir.extraData(
386386 bits.SymbolOffset,
......@@ -388,7 +388,7 @@ pub fn emitMir(emit: *Emit) Error!void {
388388 ).data;
389389 break :loc .{ mir_inst.data.ax.air_inst, .{ .plus = .{
390390 sym: {
391 loc_buf[0] = .{ .addr = .{ .sym = sym_off.sym_index } };
391 loc_buf[0] = .{ .addr_reloc = sym_off.sym_index };
392392 break :sym &loc_buf[0];
393393 },
394394 off: {
......@@ -437,7 +437,7 @@ pub fn emitMir(emit: *Emit) Error!void {
437437 .none => .{ .constu = 0 },
438438 .reg => |reg| .{ .breg = reg.dwarfNum() },
439439 .frame, .table, .rip_inst => unreachable,
440 .reloc => |sym_index| .{ .addr = .{ .sym = sym_index } },
440 .reloc => |sym_index| .{ .addr_reloc = sym_index },
441441 };
442442 break :base &loc_buf[0];
443443 },
src/libs/libcxx.zig+2-2
......@@ -308,7 +308,7 @@ pub fn buildLibCxx(comp: *Compilation, prog_node: std.Progress.Node) BuildError!
308308 assert(comp.libcxx_static_lib == null);
309309 const crt_file = try sub_compilation.toCrtFile();
310310 comp.libcxx_static_lib = crt_file;
311 comp.queueLinkTaskMode(crt_file.full_object_path, output_mode);
311 comp.queueLinkTaskMode(crt_file.full_object_path, &config);
312312}
313313
314314pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildError!void {
......@@ -504,7 +504,7 @@ pub fn buildLibCxxAbi(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
504504 assert(comp.libcxxabi_static_lib == null);
505505 const crt_file = try sub_compilation.toCrtFile();
506506 comp.libcxxabi_static_lib = crt_file;
507 comp.queueLinkTaskMode(crt_file.full_object_path, output_mode);
507 comp.queueLinkTaskMode(crt_file.full_object_path, &config);
508508}
509509
510510pub fn addCxxArgs(
src/libs/libtsan.zig+1-1
......@@ -325,7 +325,7 @@ pub fn buildTsan(comp: *Compilation, prog_node: std.Progress.Node) BuildError!vo
325325 };
326326
327327 const crt_file = try sub_compilation.toCrtFile();
328 comp.queueLinkTaskMode(crt_file.full_object_path, output_mode);
328 comp.queueLinkTaskMode(crt_file.full_object_path, &config);
329329 assert(comp.tsan_lib == null);
330330 comp.tsan_lib = crt_file;
331331}
src/libs/libunwind.zig+1-1
......@@ -195,7 +195,7 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
195195 };
196196
197197 const crt_file = try sub_compilation.toCrtFile();
198 comp.queueLinkTaskMode(crt_file.full_object_path, output_mode);
198 comp.queueLinkTaskMode(crt_file.full_object_path, &config);
199199 assert(comp.libunwind_static_lib == null);
200200 comp.libunwind_static_lib = crt_file;
201201}
src/libs/musl.zig+1-1
......@@ -278,7 +278,7 @@ pub fn buildCrtFile(comp: *Compilation, in_crt_file: CrtFile, prog_node: std.Pro
278278 errdefer comp.gpa.free(basename);
279279
280280 const crt_file = try sub_compilation.toCrtFile();
281 comp.queueLinkTaskMode(crt_file.full_object_path, output_mode);
281 comp.queueLinkTaskMode(crt_file.full_object_path, &config);
282282 {
283283 comp.mutex.lock();
284284 defer comp.mutex.unlock();
src/link/Dwarf.zig+169-69
......@@ -785,6 +785,7 @@ const Entry = struct {
785785 }
786786
787787 const Index = enum(u32) {
788 //got_proc,
788789 _,
789790
790791 const Optional = enum(u32) {
......@@ -1040,7 +1041,7 @@ const Entry = struct {
10401041 const symbol = zo.symbol(reloc.target_sym);
10411042 try dwarf.resolveReloc(
10421043 entry_off + reloc.source_off,
1043 @bitCast(symbol.address(.{}, elf_file) + @as(i64, @intCast(reloc.target_off)) -
1044 @bitCast(symbol.address(.{}, elf_file) + @as(i64, @intCast(@intFromEnum(reloc.target_off))) -
10441045 if (symbol.flags.is_tls) elf_file.dtpAddress() else 0),
10451046 @intFromEnum(dwarf.address_size),
10461047 );
......@@ -1051,7 +1052,7 @@ const Entry = struct {
10511052 const ref = zo.getSymbolRef(reloc.target_sym, macho_file);
10521053 try dwarf.resolveReloc(
10531054 entry_off + reloc.source_off,
1054 ref.getSymbol(macho_file).?.getAddress(.{}, macho_file),
1055 ref.getSymbol(macho_file).?.getAddress(.{}, macho_file) + @as(i64, @intCast(@intFromEnum(reloc.target_off))),
10551056 @intFromEnum(dwarf.address_size),
10561057 );
10571058 }
......@@ -1080,18 +1081,39 @@ const CrossSectionReloc = struct {
10801081const ExternalReloc = struct {
10811082 source_off: u32 = 0,
10821083 target_sym: u32,
1083 target_off: u64 = 0,
1084 target_off: enum(u64) {
1085 none = 0,
1086 got = std.math.maxInt(i64) + 1,
1087 _,
1088
1089 pub fn rel(off: u64) @This() {
1090 const res: @This() = @enumFromInt(off);
1091 switch (res) {
1092 .none => {},
1093 _ => {},
1094 .got => unreachable, // assertion failure
1095 }
1096 return res;
1097 }
1098 } = .none,
10841099};
10851100
10861101pub const Loc = union(enum) {
10871102 empty,
1088 addr: union(enum) { sym: u32 },
1103 addr_reloc: u32,
1104 got_reloc: u32,
1105 deref: *const Loc,
10891106 constu: u64,
10901107 consts: i64,
10911108 plus: Bin,
10921109 reg: u32,
10931110 breg: u32,
10941111 push_object_address,
1112 call: struct {
1113 args: []const Loc = &.{},
1114 unit: Unit.Index,
1115 entry: Entry.Index,
1116 },
10951117 form_tls_address: *const Loc,
10961118 implicit_value: []const u8,
10971119 stack_value: *const Loc,
......@@ -1136,11 +1158,17 @@ pub const Loc = union(enum) {
11361158 const writer = adapter.writer();
11371159 switch (loc) {
11381160 .empty => {},
1139 .addr => |addr| {
1161 .addr_reloc => |sym_index| {
11401162 try writer.writeByte(DW.OP.addr);
1141 switch (addr) {
1142 .sym => |sym_index| try adapter.addrSym(sym_index),
1143 }
1163 try adapter.addrSym(sym_index);
1164 },
1165 .deref => |addr| {
1166 try addr.write(adapter);
1167 try writer.writeByte(DW.OP.deref);
1168 },
1169 .got_reloc => |sym_index| {
1170 try writer.writeByte(DW.OP.const4s);
1171 try adapter.gotSym(sym_index);
11441172 },
11451173 .constu => |constu| if (std.math.cast(u5, constu)) |lit| {
11461174 try writer.writeByte(@as(u8, DW.OP.lit0) + lit);
......@@ -1225,6 +1253,11 @@ pub const Loc = union(enum) {
12251253 try sleb128(writer, 0);
12261254 },
12271255 .push_object_address => try writer.writeByte(DW.OP.push_object_address),
1256 .call => |call| {
1257 for (call.args) |arg| try arg.write(adapter);
1258 try writer.writeByte(DW.OP.call_ref);
1259 try adapter.infoEntry(call.unit, call.entry);
1260 },
12281261 .form_tls_address => |addr| {
12291262 try addr.write(adapter);
12301263 try writer.writeByte(DW.OP.form_tls_address);
......@@ -1385,12 +1418,12 @@ pub const Cfa = union(enum) {
13851418 },
13861419 .def_cfa_expression => |expr| {
13871420 try writer.writeByte(DW.CFA.def_cfa_expression);
1388 try wip_nav.frameExprloc(expr);
1421 try wip_nav.frameExprLoc(expr);
13891422 },
13901423 .expression => |reg_expr| {
13911424 try writer.writeByte(DW.CFA.expression);
13921425 try uleb128(writer, reg_expr.reg);
1393 try wip_nav.frameExprloc(reg_expr.expr);
1426 try wip_nav.frameExprLoc(reg_expr.expr);
13941427 },
13951428 .val_offset => |reg_off| {
13961429 const factored_off = @divExact(reg_off.off, wip_nav.dwarf.debug_frame.header.data_alignment_factor);
......@@ -1407,7 +1440,7 @@ pub const Cfa = union(enum) {
14071440 .val_expression => |reg_expr| {
14081441 try writer.writeByte(DW.CFA.val_expression);
14091442 try uleb128(writer, reg_expr.reg);
1410 try wip_nav.frameExprloc(reg_expr.expr);
1443 try wip_nav.frameExprLoc(reg_expr.expr);
14111444 },
14121445 .escape => |bytes| try writer.writeAll(bytes),
14131446 }
......@@ -1471,7 +1504,7 @@ pub const WipNav = struct {
14711504 });
14721505 try wip_nav.strp(name);
14731506 try wip_nav.refType(ty);
1474 try wip_nav.infoExprloc(loc);
1507 try wip_nav.infoExprLoc(loc);
14751508 wip_nav.any_children = true;
14761509 }
14771510
......@@ -1733,6 +1766,9 @@ pub const WipNav = struct {
17331766 fn endian(_: ExprLocCounter) std.builtin.Endian {
17341767 return @import("builtin").cpu.arch.endian();
17351768 }
1769 fn gotSym(counter: *ExprLocCounter, _: u32) error{}!void {
1770 counter.stream.bytes_written += 4;
1771 }
17361772 fn addrSym(counter: *ExprLocCounter, _: u32) error{}!void {
17371773 counter.stream.bytes_written += @intFromEnum(counter.address_size);
17381774 }
......@@ -1741,7 +1777,7 @@ pub const WipNav = struct {
17411777 }
17421778 };
17431779
1744 fn infoExprloc(wip_nav: *WipNav, loc: Loc) UpdateError!void {
1780 fn infoExprLoc(wip_nav: *WipNav, loc: Loc) UpdateError!void {
17451781 var counter: ExprLocCounter = .init(wip_nav.dwarf);
17461782 try loc.write(&counter);
17471783
......@@ -1753,6 +1789,14 @@ pub const WipNav = struct {
17531789 fn endian(ctx: @This()) std.builtin.Endian {
17541790 return ctx.wip_nav.dwarf.endian;
17551791 }
1792 fn gotSym(ctx: @This(), sym_index: u32) UpdateError!void {
1793 try ctx.wip_nav.infoExternalReloc(.{
1794 .source_off = @intCast(ctx.wip_nav.debug_info.items.len),
1795 .target_sym = sym_index,
1796 .target_off = .got,
1797 });
1798 try ctx.wip_nav.debug_info.appendNTimes(ctx.wip_nav.dwarf.gpa, 0, 4);
1799 }
17561800 fn addrSym(ctx: @This(), sym_index: u32) UpdateError!void {
17571801 try ctx.wip_nav.infoAddrSym(sym_index, 0);
17581802 }
......@@ -1768,12 +1812,12 @@ pub const WipNav = struct {
17681812 try wip_nav.infoExternalReloc(.{
17691813 .source_off = @intCast(wip_nav.debug_info.items.len),
17701814 .target_sym = sym_index,
1771 .target_off = sym_off,
1815 .target_off = .rel(sym_off),
17721816 });
17731817 try wip_nav.debug_info.appendNTimes(wip_nav.dwarf.gpa, 0, @intFromEnum(wip_nav.dwarf.address_size));
17741818 }
17751819
1776 fn frameExprloc(wip_nav: *WipNav, loc: Loc) UpdateError!void {
1820 fn frameExprLoc(wip_nav: *WipNav, loc: Loc) UpdateError!void {
17771821 var counter: ExprLocCounter = .init(wip_nav.dwarf);
17781822 try loc.write(&counter);
17791823
......@@ -1785,6 +1829,14 @@ pub const WipNav = struct {
17851829 fn endian(ctx: @This()) std.builtin.Endian {
17861830 return ctx.wip_nav.dwarf.endian;
17871831 }
1832 fn gotSym(ctx: @This(), sym_index: u32) UpdateError!void {
1833 try ctx.wip_nav.frameExternalReloc(.{
1834 .source_off = @intCast(ctx.wip_nav.debug_frame.items.len),
1835 .target_sym = sym_index,
1836 .target_off = .got,
1837 });
1838 try ctx.wip_nav.debug_frame.appendNTimes(ctx.wip_nav.dwarf.gpa, 0, 4);
1839 }
17881840 fn addrSym(ctx: @This(), sym_index: u32) UpdateError!void {
17891841 try ctx.wip_nav.frameAddrSym(sym_index, 0);
17901842 }
......@@ -1800,7 +1852,7 @@ pub const WipNav = struct {
18001852 try wip_nav.frameExternalReloc(.{
18011853 .source_off = @intCast(wip_nav.debug_frame.items.len),
18021854 .target_sym = sym_index,
1803 .target_off = sym_off,
1855 .target_off = .rel(sym_off),
18041856 });
18051857 try wip_nav.debug_frame.appendNTimes(wip_nav.dwarf.gpa, 0, @intFromEnum(wip_nav.dwarf.address_size));
18061858 }
......@@ -2286,50 +2338,81 @@ fn getUnit(dwarf: *Dwarf, mod: *Module) !Unit.Index {
22862338 const mod_gop = try dwarf.mods.getOrPut(dwarf.gpa, mod);
22872339 const unit: Unit.Index = @enumFromInt(mod_gop.index);
22882340 if (!mod_gop.found_existing) {
2289 errdefer _ = dwarf.mods.pop();
2290 mod_gop.value_ptr.* = .{
2291 .root_dir_path = undefined,
2292 .dirs = .empty,
2293 .files = .empty,
2294 };
2295 errdefer mod_gop.value_ptr.dirs.deinit(dwarf.gpa);
2296 try mod_gop.value_ptr.dirs.putNoClobber(dwarf.gpa, unit, {});
2297 assert(try dwarf.debug_aranges.section.addUnit(
2298 DebugAranges.headerBytes(dwarf),
2299 DebugAranges.trailerBytes(dwarf),
2300 dwarf,
2301 ) == unit);
2302 errdefer dwarf.debug_aranges.section.popUnit(dwarf.gpa);
2303 assert(try dwarf.debug_frame.section.addUnit(
2304 DebugFrame.headerBytes(dwarf),
2305 DebugFrame.trailerBytes(dwarf),
2306 dwarf,
2307 ) == unit);
2308 errdefer dwarf.debug_frame.section.popUnit(dwarf.gpa);
2309 assert(try dwarf.debug_info.section.addUnit(
2310 DebugInfo.headerBytes(dwarf),
2311 DebugInfo.trailer_bytes,
2312 dwarf,
2313 ) == unit);
2314 errdefer dwarf.debug_info.section.popUnit(dwarf.gpa);
2315 assert(try dwarf.debug_line.section.addUnit(
2316 DebugLine.headerBytes(dwarf, 5, 25),
2317 DebugLine.trailer_bytes,
2318 dwarf,
2319 ) == unit);
2320 errdefer dwarf.debug_line.section.popUnit(dwarf.gpa);
2321 assert(try dwarf.debug_loclists.section.addUnit(
2322 DebugLocLists.headerBytes(dwarf),
2323 DebugLocLists.trailer_bytes,
2324 dwarf,
2325 ) == unit);
2326 errdefer dwarf.debug_loclists.section.popUnit(dwarf.gpa);
2327 assert(try dwarf.debug_rnglists.section.addUnit(
2328 DebugRngLists.headerBytes(dwarf),
2329 DebugRngLists.trailer_bytes,
2330 dwarf,
2331 ) == unit);
2332 errdefer dwarf.debug_rnglists.section.popUnit(dwarf.gpa);
2341 {
2342 errdefer _ = dwarf.mods.pop();
2343 mod_gop.value_ptr.* = .{
2344 .root_dir_path = undefined,
2345 .dirs = .empty,
2346 .files = .empty,
2347 };
2348 errdefer mod_gop.value_ptr.dirs.deinit(dwarf.gpa);
2349 try mod_gop.value_ptr.dirs.putNoClobber(dwarf.gpa, unit, {});
2350 assert(try dwarf.debug_aranges.section.addUnit(
2351 DebugAranges.headerBytes(dwarf),
2352 DebugAranges.trailerBytes(dwarf),
2353 dwarf,
2354 ) == unit);
2355 errdefer dwarf.debug_aranges.section.popUnit(dwarf.gpa);
2356 assert(try dwarf.debug_frame.section.addUnit(
2357 DebugFrame.headerBytes(dwarf),
2358 DebugFrame.trailerBytes(dwarf),
2359 dwarf,
2360 ) == unit);
2361 errdefer dwarf.debug_frame.section.popUnit(dwarf.gpa);
2362 assert(try dwarf.debug_info.section.addUnit(
2363 DebugInfo.headerBytes(dwarf),
2364 DebugInfo.trailer_bytes,
2365 dwarf,
2366 ) == unit);
2367 errdefer dwarf.debug_info.section.popUnit(dwarf.gpa);
2368 assert(try dwarf.debug_line.section.addUnit(
2369 DebugLine.headerBytes(dwarf, 5, 25),
2370 DebugLine.trailer_bytes,
2371 dwarf,
2372 ) == unit);
2373 errdefer dwarf.debug_line.section.popUnit(dwarf.gpa);
2374 assert(try dwarf.debug_loclists.section.addUnit(
2375 DebugLocLists.headerBytes(dwarf),
2376 DebugLocLists.trailer_bytes,
2377 dwarf,
2378 ) == unit);
2379 errdefer dwarf.debug_loclists.section.popUnit(dwarf.gpa);
2380 assert(try dwarf.debug_rnglists.section.addUnit(
2381 DebugRngLists.headerBytes(dwarf),
2382 DebugRngLists.trailer_bytes,
2383 dwarf,
2384 ) == unit);
2385 errdefer dwarf.debug_rnglists.section.popUnit(dwarf.gpa);
2386 }
2387 //if (dwarf.bin_file.cast(.elf)) |elf_file| {
2388 // if (unit == .main) assert(try dwarf.addCommonEntry(unit) == .got_proc);
2389 // if (mod.pic and dwarf.debug_info.section.getUnit(.main).getEntry(.got_proc).len == 0) {
2390 // var wip_nav: WipNav = .{
2391 // .dwarf = dwarf,
2392 // .pt = undefined,
2393 // .unit = .main,
2394 // .entry = .got_proc,
2395 // .any_children = false,
2396 // .func = .none,
2397 // .func_sym_index = undefined,
2398 // .func_high_pc = undefined,
2399 // .blocks = undefined,
2400 // .cfi = undefined,
2401 // .debug_frame = .empty,
2402 // .debug_info = .empty,
2403 // .debug_line = .empty,
2404 // .debug_loclists = .empty,
2405 // .pending_lazy = .empty,
2406 // };
2407 // defer wip_nav.deinit();
2408 // try wip_nav.abbrevCode(.proc);
2409 // try wip_nav.infoExprLoc(.{ .deref = &.{ .plus = .{
2410 // &.empty,
2411 // &.{ .addr_reloc = try elf_file.zigObjectPtr().?.getGlobalSymbol(elf_file, "_GLOBAL_OFFSET_TABLE_", null) },
2412 // } } });
2413 // try dwarf.debug_info.section.replaceEntry(wip_nav.unit, wip_nav.entry, dwarf, wip_nav.debug_info.items);
2414 // }
2415 //}
23332416 }
23342417 return unit;
23352418}
......@@ -2384,7 +2467,8 @@ fn initWipNavInner(
23842467 else => {},
23852468 }
23862469
2387 const unit = try dwarf.getUnit(file.mod.?);
2470 const mod = file.mod.?;
2471 const unit = try dwarf.getUnit(mod);
23882472 const nav_gop = try dwarf.navs.getOrPut(dwarf.gpa, nav_index);
23892473 errdefer _ = if (!nav_gop.found_existing) dwarf.navs.pop();
23902474 if (nav_gop.found_existing) {
......@@ -2425,13 +2509,22 @@ fn initWipNavInner(
24252509 }, &nav, inst_info.file, &decl);
24262510 try wip_nav.strp(nav.fqn.toSlice(ip));
24272511 const ty: Type = nav_val.typeOf(zcu);
2428 const addr: Loc = .{ .addr = .{ .sym = sym_index } };
2429 const loc: Loc = if (decl.is_threadlocal) .{ .form_tls_address = &addr } else addr;
2512 const addr: Loc = .{ .addr_reloc = sym_index };
2513 const loc: Loc = loc: {
2514 if (dwarf.bin_file.cast(.elf)) |elf_file| if (decl.linkage == .@"extern" and mod.pic)
2515 // TODO: lldb doesn't support call :(
2516 //.{ .call = .{ .args = &.{.{ .got_reloc = sym_index }}, .unit = .main, .entry = .got_proc } }
2517 break :loc .{ .deref = &.{ .plus = .{
2518 &.{ .addr_reloc = try elf_file.zigObjectPtr().?.getGlobalSymbol(elf_file, "_GLOBAL_OFFSET_TABLE_", null) },
2519 &.{ .got_reloc = sym_index },
2520 } } };
2521 break :loc if (decl.is_threadlocal) .{ .form_tls_address = &addr } else addr;
2522 };
24302523 switch (decl.kind) {
24312524 .unnamed_test, .@"test", .decltest, .@"comptime", .@"usingnamespace" => unreachable,
24322525 .@"const" => {
24332526 const const_ty_reloc_index = try wip_nav.refForward();
2434 try wip_nav.infoExprloc(loc);
2527 try wip_nav.infoExprLoc(loc);
24352528 try uleb128(diw, nav.status.fully_resolved.alignment.toByteUnits() orelse
24362529 ty.abiAlignment(zcu).toByteUnits().?);
24372530 try diw.writeByte(@intFromBool(decl.linkage != .normal));
......@@ -2441,7 +2534,7 @@ fn initWipNavInner(
24412534 },
24422535 .@"var" => {
24432536 try wip_nav.refType(ty);
2444 try wip_nav.infoExprloc(loc);
2537 try wip_nav.infoExprLoc(loc);
24452538 try uleb128(diw, nav.status.fully_resolved.alignment.toByteUnits() orelse
24462539 ty.abiAlignment(zcu).toByteUnits().?);
24472540 try diw.writeByte(@intFromBool(decl.linkage != .normal));
......@@ -2649,7 +2742,7 @@ pub fn finishWipNavFunc(
26492742 .{
26502743 .source_off = 1 + @intFromEnum(dwarf.address_size),
26512744 .target_sym = wip_nav.func_sym_index,
2652 .target_off = code_size,
2745 .target_off = .rel(code_size),
26532746 },
26542747 });
26552748 try dwarf.debug_rnglists.section.replaceEntry(
......@@ -3838,7 +3931,7 @@ fn updateLazyValue(
38383931 byte_offset += base_ptr.byte_offset;
38393932 };
38403933 try wip_nav.abbrevCode(.location_comptime_value);
3841 try wip_nav.infoExprloc(.{ .implicit_pointer = .{
3934 try wip_nav.infoExprLoc(.{ .implicit_pointer = .{
38423935 .unit = base_unit,
38433936 .entry = base_entry,
38443937 .offset = byte_offset,
......@@ -4360,7 +4453,7 @@ fn refAbbrevCode(dwarf: *Dwarf, abbrev_code: AbbrevCode) UpdateError!@typeInfo(A
43604453 assert(abbrev_code != .null);
43614454 const entry: Entry.Index = @enumFromInt(@intFromEnum(abbrev_code));
43624455 if (dwarf.debug_abbrev.section.getUnit(DebugAbbrev.unit).getEntry(entry).len > 0) return @intFromEnum(abbrev_code);
4363 var debug_abbrev = std.ArrayList(u8).init(dwarf.gpa);
4456 var debug_abbrev: std.ArrayList(u8) = .init(dwarf.gpa);
43644457 defer debug_abbrev.deinit();
43654458 const daw = debug_abbrev.writer();
43664459 const abbrev = AbbrevCode.abbrevs.get(abbrev_code);
......@@ -4422,7 +4515,7 @@ pub fn flushModule(dwarf: *Dwarf, pt: Zcu.PerThread) FlushError!void {
44224515 mod_info.root_dir_path = try dwarf.debug_line_str.addString(dwarf, root_dir_path);
44234516 }
44244517
4425 var header = std.ArrayList(u8).init(dwarf.gpa);
4518 var header: std.ArrayList(u8) = .init(dwarf.gpa);
44264519 defer header.deinit();
44274520 if (dwarf.debug_aranges.section.dirty) {
44284521 for (dwarf.debug_aranges.section.units.items, 0..) |*unit_ptr, unit_index| {
......@@ -4888,6 +4981,7 @@ const AbbrevCode = enum {
48884981 comptime_value_field_comptime_state,
48894982 comptime_value_elem_runtime_bits,
48904983 comptime_value_elem_comptime_state,
4984 //proc,
48914985
48924986 const decl_bytes = uleb128Bytes(@intFromEnum(AbbrevCode.decl_instance_func_generic));
48934987 comptime {
......@@ -5757,6 +5851,12 @@ const AbbrevCode = enum {
57575851 .{ .ZIG_comptime_value, .ref_addr },
57585852 },
57595853 },
5854 //.proc = .{
5855 // .tag = .dwarf_procedure,
5856 // .attrs = &.{
5857 // .{ .location, .exprloc },
5858 // },
5859 //},
57605860 .null = undefined,
57615861 });
57625862};
src/link/Elf/ZigObject.zig+7-4
......@@ -463,8 +463,11 @@ pub fn flush(self: *ZigObject, elf_file: *Elf, tid: Zcu.PerThread.Id) !void {
463463 for (entry.external_relocs.items) |reloc| {
464464 const target_sym = self.symbol(reloc.target_sym);
465465 const r_offset = entry_off + reloc.source_off;
466 const r_addend: i64 = @intCast(reloc.target_off);
467 const r_type = relocation.dwarf.externalRelocType(target_sym.*, sect_index, dwarf.address_size, cpu_arch);
466 const r_addend: i64 = switch (reloc.target_off) {
467 .none, .got => 0,
468 else => |off| @intCast(@intFromEnum(off)),
469 };
470 const r_type = relocation.dwarf.externalRelocType(target_sym.*, reloc.target_off == .got, sect_index, dwarf.address_size, cpu_arch);
468471 atom_ptr.addRelocAssumeCapacity(.{
469472 .r_offset = r_offset,
470473 .r_addend = r_addend,
......@@ -947,7 +950,7 @@ pub fn getNavVAddr(
947950 .dwarf => |wip_nav| try wip_nav.infoExternalReloc(.{
948951 .source_off = @intCast(reloc_info.offset),
949952 .target_sym = this_sym_index,
950 .target_off = reloc_info.addend,
953 .target_off = .rel(reloc_info.addend),
951954 }),
952955 .plan9 => unreachable,
953956 .none => unreachable,
......@@ -980,7 +983,7 @@ pub fn getUavVAddr(
980983 .dwarf => |wip_nav| try wip_nav.infoExternalReloc(.{
981984 .source_off = @intCast(reloc_info.offset),
982985 .target_sym = sym_index,
983 .target_off = reloc_info.addend,
986 .target_off = .rel(reloc_info.addend),
984987 }),
985988 .plan9 => unreachable,
986989 .none => unreachable,
src/link/Elf/relocation.zig+2-1
......@@ -108,12 +108,13 @@ pub const dwarf = struct {
108108
109109 pub fn externalRelocType(
110110 target: Symbol,
111 is_got: bool,
111112 source_section: Dwarf.Section.Index,
112113 address_size: Dwarf.AddressSize,
113114 cpu_arch: std.Target.Cpu.Arch,
114115 ) u32 {
115116 return switch (cpu_arch) {
116 .x86_64 => @intFromEnum(@as(elf.R_X86_64, switch (source_section) {
117 .x86_64 => @intFromEnum(@as(elf.R_X86_64, if (is_got) .GOT32 else switch (source_section) {
117118 else => switch (address_size) {
118119 .@"32" => if (target.flags.is_tls) .DTPOFF32 else .@"32",
119120 .@"64" => if (target.flags.is_tls) .DTPOFF64 else .@"64",
src/link/MachO/ZigObject.zig+2-2
......@@ -648,7 +648,7 @@ pub fn getNavVAddr(
648648 .dwarf => |wip_nav| try wip_nav.infoExternalReloc(.{
649649 .source_off = @intCast(reloc_info.offset),
650650 .target_sym = sym_index,
651 .target_off = reloc_info.addend,
651 .target_off = .rel(reloc_info.addend),
652652 }),
653653 .plan9 => unreachable,
654654 .none => unreachable,
......@@ -688,7 +688,7 @@ pub fn getUavVAddr(
688688 .dwarf => |wip_nav| try wip_nav.infoExternalReloc(.{
689689 .source_off = @intCast(reloc_info.offset),
690690 .target_sym = sym_index,
691 .target_off = reloc_info.addend,
691 .target_off = .rel(reloc_info.addend),
692692 }),
693693 .plan9 => unreachable,
694694 .none => unreachable,
src/target.zig+4
......@@ -223,6 +223,10 @@ pub fn hasLldSupport(ofmt: std.Target.ObjectFormat) bool {
223223/// than or equal to the number of behavior tests as the respective LLVM backend.
224224pub fn selfHostedBackendIsAsRobustAsLlvm(target: std.Target) bool {
225225 if (target.cpu.arch.isSpirV()) return true;
226 if (target.cpu.arch == .x86_64 and target.ptrBitWidth() == 64) return switch (target.ofmt) {
227 .elf, .macho => true,
228 else => false,
229 };
226230 return false;
227231}
228232
test/behavior/math.zig+1
......@@ -1722,6 +1722,7 @@ test "signed zeros are represented properly" {
17221722 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
17231723 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
17241724 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
1725 if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
17251726
17261727 const S = struct {
17271728 fn doTheTest() !void {
test/tests.zig+2-6
......@@ -1113,8 +1113,6 @@ const test_targets = blk: {
11131113 .os_tag = .linux,
11141114 .abi = .none,
11151115 },
1116 .use_llvm = false,
1117 .use_lld = false,
11181116 },
11191117 .{
11201118 .target = .{
......@@ -1123,8 +1121,6 @@ const test_targets = blk: {
11231121 .os_tag = .linux,
11241122 .abi = .none,
11251123 },
1126 .use_llvm = false,
1127 .use_lld = false,
11281124 .pic = true,
11291125 },
11301126 .{
......@@ -1134,8 +1130,6 @@ const test_targets = blk: {
11341130 .os_tag = .linux,
11351131 .abi = .none,
11361132 },
1137 .use_llvm = false,
1138 .use_lld = false,
11391133 .strip = true,
11401134 },
11411135 .{
......@@ -1144,6 +1138,8 @@ const test_targets = blk: {
11441138 .os_tag = .linux,
11451139 .abi = .none,
11461140 },
1141 .use_llvm = true,
1142 .use_lld = true,
11471143 },
11481144 .{
11491145 .target = .{