authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2025-01-22 16:48:27+00:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-01-22 16:48:27+00:00
log0e815c652d7908be62612bb931c2ee9698dd41da
tree2fdefb0b7575805af532ed4fb60057d1cb3dc206
parent61fe307d0f05eea901577900f4ab2bdaf0ffb35f
parentd4b6a53327352dc239644dab0ec2abbe3a1b1be9
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #22572 from jacobly0/new-error-trace

compiler: include error trace in all functions, implement for x86_64 backend

12 files changed, 174 insertions(+), 106 deletions(-)

lib/std/builtin.zig+2-1
......@@ -1150,9 +1150,10 @@ pub const panicInactiveUnionField = Panic.inactiveUnionField;
11501150/// To be deleted after zig1.wasm is updated.
11511151pub const panic_messages = Panic.messages;
11521152
1153pub noinline fn returnError(st: *StackTrace) void {
1153pub noinline fn returnError() void {
11541154 @branchHint(.unlikely);
11551155 @setRuntimeSafety(false);
1156 const st = @errorReturnTrace().?;
11561157 if (st.index < st.instruction_addresses.len)
11571158 st.instruction_addresses[st.index] = @returnAddress();
11581159 st.index += 1;
src/InternPool.zig+7-18
......@@ -2294,17 +2294,6 @@ pub const Key = union(enum) {
22942294 return @atomicLoad(FuncAnalysis, func.analysisPtr(ip), .unordered);
22952295 }
22962296
2297 pub fn setCallsOrAwaitsErrorableFn(func: Func, ip: *InternPool, value: bool) void {
2298 const extra_mutex = &ip.getLocal(func.tid).mutate.extra.mutex;
2299 extra_mutex.lock();
2300 defer extra_mutex.unlock();
2301
2302 const analysis_ptr = func.analysisPtr(ip);
2303 var analysis = analysis_ptr.*;
2304 analysis.calls_or_awaits_errorable_fn = value;
2305 @atomicStore(FuncAnalysis, analysis_ptr, analysis, .release);
2306 }
2307
23082297 pub fn setBranchHint(func: Func, ip: *InternPool, hint: std.builtin.BranchHint) void {
23092298 const extra_mutex = &ip.getLocal(func.tid).mutate.extra.mutex;
23102299 extra_mutex.lock();
......@@ -5975,7 +5964,7 @@ pub const FuncAnalysis = packed struct(u32) {
59755964 is_analyzed: bool,
59765965 branch_hint: std.builtin.BranchHint,
59775966 is_noinline: bool,
5978 calls_or_awaits_errorable_fn: bool,
5967 has_error_trace: bool,
59795968 /// True if this function has an inferred error set.
59805969 inferred_error_set: bool,
59815970 disable_instrumentation: bool,
......@@ -9007,7 +8996,7 @@ pub fn getFuncDecl(
90078996 .is_analyzed = false,
90088997 .branch_hint = .none,
90098998 .is_noinline = key.is_noinline,
9010 .calls_or_awaits_errorable_fn = false,
8999 .has_error_trace = false,
90119000 .inferred_error_set = false,
90129001 .disable_instrumentation = false,
90139002 },
......@@ -9116,7 +9105,7 @@ pub fn getFuncDeclIes(
91169105 .is_analyzed = false,
91179106 .branch_hint = .none,
91189107 .is_noinline = key.is_noinline,
9119 .calls_or_awaits_errorable_fn = false,
9108 .has_error_trace = false,
91209109 .inferred_error_set = true,
91219110 .disable_instrumentation = false,
91229111 },
......@@ -9312,7 +9301,7 @@ pub fn getFuncInstance(
93129301 .is_analyzed = false,
93139302 .branch_hint = .none,
93149303 .is_noinline = arg.is_noinline,
9315 .calls_or_awaits_errorable_fn = false,
9304 .has_error_trace = false,
93169305 .inferred_error_set = false,
93179306 .disable_instrumentation = false,
93189307 },
......@@ -9410,7 +9399,7 @@ pub fn getFuncInstanceIes(
94109399 .is_analyzed = false,
94119400 .branch_hint = .none,
94129401 .is_noinline = arg.is_noinline,
9413 .calls_or_awaits_errorable_fn = false,
9402 .has_error_trace = false,
94149403 .inferred_error_set = true,
94159404 .disable_instrumentation = false,
94169405 },
......@@ -12174,7 +12163,7 @@ pub fn funcAnalysisUnordered(ip: *const InternPool, func: Index) FuncAnalysis {
1217412163 return @atomicLoad(FuncAnalysis, ip.funcAnalysisPtr(func), .unordered);
1217512164}
1217612165
12177pub fn funcSetCallsOrAwaitsErrorableFn(ip: *InternPool, func: Index) void {
12166pub fn funcSetHasErrorTrace(ip: *InternPool, func: Index, has_error_trace: bool) void {
1217812167 const unwrapped_func = func.unwrap(ip);
1217912168 const extra_mutex = &ip.getLocal(unwrapped_func.tid).mutate.extra.mutex;
1218012169 extra_mutex.lock();
......@@ -12182,7 +12171,7 @@ pub fn funcSetCallsOrAwaitsErrorableFn(ip: *InternPool, func: Index) void {
1218212171
1218312172 const analysis_ptr = ip.funcAnalysisPtr(func);
1218412173 var analysis = analysis_ptr.*;
12185 analysis.calls_or_awaits_errorable_fn = true;
12174 analysis.has_error_trace = has_error_trace;
1218612175 @atomicStore(FuncAnalysis, analysis_ptr, analysis, .release);
1218712176}
1218812177
src/Sema.zig+19-24
......@@ -7198,14 +7198,6 @@ fn zirCall(
71987198 const call_dbg_node: Zir.Inst.Index = @enumFromInt(@intFromEnum(inst) - 1);
71997199 const call_inst = try sema.analyzeCall(block, func, func_ty, callee_src, call_src, modifier, ensure_result_used, args_info, call_dbg_node, .call);
72007200
7201 switch (sema.owner.unwrap()) {
7202 .@"comptime", .type, .memoized_state, .nav_ty, .nav_val => input_is_error = false,
7203 .func => |owner_func| if (!zcu.intern_pool.funcAnalysisUnordered(owner_func).calls_or_awaits_errorable_fn) {
7204 // No errorable fn actually called; we have no error return trace
7205 input_is_error = false;
7206 },
7207 }
7208
72097201 if (block.ownerModule().error_tracing and
72107202 !block.isComptime() and !block.is_typeof and (input_is_error or pop_error_return_trace))
72117203 {
......@@ -7872,6 +7864,12 @@ fn analyzeCall(
78727864 }
78737865 break :msg msg;
78747866 });
7867 if (func_ty_info.cc == .auto) {
7868 switch (sema.owner.unwrap()) {
7869 .@"comptime", .nav_ty, .nav_val, .type, .memoized_state => {},
7870 .func => |owner_func| ip.funcSetHasErrorTrace(owner_func, true),
7871 }
7872 }
78757873 for (args, 0..) |arg, arg_idx| {
78767874 try sema.validateRuntimeValue(block, args_info.argSrc(block, arg_idx), arg);
78777875 }
......@@ -7946,13 +7944,6 @@ fn analyzeCall(
79467944 try zcu.ensureFuncBodyAnalysisQueued(runtime_func_val.toIntern());
79477945 }
79487946
7949 switch (sema.owner.unwrap()) {
7950 .@"comptime", .nav_ty, .nav_val, .type, .memoized_state => {},
7951 .func => |owner_func| if (resolved_ret_ty.isError(zcu)) {
7952 ip.funcSetCallsOrAwaitsErrorableFn(owner_func);
7953 },
7954 }
7955
79567947 const call_tag: Air.Inst.Tag = switch (modifier) {
79577948 .auto, .no_async => .call,
79587949 .never_tail => .call_never_tail,
......@@ -19706,16 +19697,16 @@ fn retWithErrTracing(
1970619697 .bool_false => false,
1970719698 else => true,
1970819699 };
19700
19701 // This means we're returning something that might be an error!
19702 // This should only be possible with the `auto` cc, so we definitely have an error trace.
19703 assert(pt.zcu.intern_pool.funcAnalysisUnordered(sema.owner.unwrap().func).has_error_trace);
19704
1970919705 const gpa = sema.gpa;
19710 const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
19711 try stack_trace_ty.resolveFields(pt);
19712 const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
19713 const err_return_trace = try block.addTy(.err_return_trace, ptr_stack_trace_ty);
1971419706 const return_err_fn = Air.internedToRef(try sema.getBuiltin(src, .returnError));
19715 const args: [1]Air.Inst.Ref = .{err_return_trace};
1971619707
1971719708 if (!need_check) {
19718 try sema.callBuiltin(block, src, return_err_fn, .never_inline, &args, .@"error return");
19709 try sema.callBuiltin(block, src, return_err_fn, .never_inline, &.{}, .@"error return");
1971919710 _ = try block.addUnOp(ret_tag, operand);
1972019711 return;
1972119712 }
......@@ -19726,7 +19717,7 @@ fn retWithErrTracing(
1972619717
1972719718 var else_block = block.makeSubBlock();
1972819719 defer else_block.instructions.deinit(gpa);
19729 try sema.callBuiltin(&else_block, src, return_err_fn, .never_inline, &args, .@"error return");
19720 try sema.callBuiltin(&else_block, src, return_err_fn, .never_inline, &.{}, .@"error return");
1973019721 _ = try else_block.addUnOp(ret_tag, operand);
1973119722
1973219723 try sema.air_extra.ensureUnusedCapacity(gpa, @typeInfo(Air.CondBr).@"struct".fields.len +
......@@ -19837,7 +19828,7 @@ fn restoreErrRetIndex(sema: *Sema, start_block: *Block, src: LazySrcLoc, target_
1983719828 return;
1983819829 }
1983919830
19840 if (!zcu.intern_pool.funcAnalysisUnordered(sema.owner.unwrap().func).calls_or_awaits_errorable_fn) return;
19831 if (!zcu.intern_pool.funcAnalysisUnordered(sema.owner.unwrap().func).has_error_trace) return;
1984119832 if (!start_block.ownerModule().error_tracing) return;
1984219833
1984319834 assert(saved_index != .none); // The .error_return_trace_index field was dropped somewhere
......@@ -21123,7 +21114,7 @@ fn getErrorReturnTrace(sema: *Sema, block: *Block) CompileError!Air.Inst.Ref {
2112321114 const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
2112421115
2112521116 switch (sema.owner.unwrap()) {
21126 .func => |func| if (ip.funcAnalysisUnordered(func).calls_or_awaits_errorable_fn and block.ownerModule().error_tracing) {
21117 .func => |func| if (ip.funcAnalysisUnordered(func).has_error_trace and block.ownerModule().error_tracing) {
2112721118 return block.addTy(.err_return_trace, opt_ptr_stack_trace_ty);
2112821119 },
2112921120 .@"comptime", .nav_ty, .nav_val, .type, .memoized_state => {},
......@@ -27096,6 +27087,10 @@ fn preparePanicId(sema: *Sema, src: LazySrcLoc, panic_id: Zcu.PanicId) !InternPo
2709627087 const zcu = sema.pt.zcu;
2709727088 try sema.ensureMemoizedStateResolved(src, .panic);
2709827089 try zcu.ensureFuncBodyAnalysisQueued(zcu.builtin_decl_values.get(.@"Panic.call"));
27090 switch (sema.owner.unwrap()) {
27091 .@"comptime", .nav_ty, .nav_val, .type, .memoized_state => {},
27092 .func => |owner_func| zcu.intern_pool.funcSetHasErrorTrace(owner_func, true),
27093 }
2709927094 return zcu.builtin_decl_values.get(panic_id.toBuiltin());
2710027095}
2710127096
src/Zcu/PerThread.zig+4-6
......@@ -2596,7 +2596,7 @@ fn analyzeFnBodyInner(pt: Zcu.PerThread, func_index: InternPool.Index) Zcu.SemaE
25962596 }
25972597
25982598 // reset in case calls to errorable functions are removed.
2599 func.setCallsOrAwaitsErrorableFn(ip, false);
2599 ip.funcSetHasErrorTrace(func_index, fn_ty_info.cc == .auto);
26002600
26012601 // First few indexes of extra are reserved and set at the end.
26022602 const reserved_count = @typeInfo(Air.ExtraIndex).@"enum".fields.len;
......@@ -2707,11 +2707,9 @@ fn analyzeFnBodyInner(pt: Zcu.PerThread, func_index: InternPool.Index) Zcu.SemaE
27072707
27082708 func.setBranchHint(ip, sema.branch_hint orelse .none);
27092709
2710 // If we don't get an error return trace from a caller, create our own.
2711 if (func.analysisUnordered(ip).calls_or_awaits_errorable_fn and
2712 zcu.comp.config.any_error_tracing and
2713 !sema.fn_ret_ty.isError(zcu))
2714 {
2710 if (zcu.comp.config.any_error_tracing and func.analysisUnordered(ip).has_error_trace and fn_ty_info.cc != .auto) {
2711 // We're using an error trace, but didn't start out with one from the caller.
2712 // We'll have to create it at the start of the function.
27152713 sema.setupErrorReturnTrace(&inner_block, last_arg_index) catch |err| switch (err) {
27162714 error.ComptimeReturn => unreachable,
27172715 error.ComptimeBreak => unreachable,
src/arch/x86_64/CodeGen.zig+123-40
......@@ -33,6 +33,8 @@ const FrameIndex = bits.FrameIndex;
3333
3434const InnerError = codegen.CodeGenError || error{OutOfRegisters};
3535
36const err_ret_trace_index: Air.Inst.Index = @enumFromInt(std.math.maxInt(u32));
37
3638gpa: Allocator,
3739pt: Zcu.PerThread,
3840air: Air,
......@@ -55,6 +57,7 @@ va_info: union {
5557 win64: struct {},
5658},
5759ret_mcv: InstTracking,
60err_ret_trace_reg: Register,
5861fn_type: Type,
5962src_loc: Zcu.LazySrcLoc,
6063
......@@ -626,6 +629,7 @@ const InstTracking = struct {
626629 switch (self.long) {
627630 .none => self.long = try cg.allocRegOrMem(inst, false),
628631 .load_frame => {},
632 .lea_frame => return,
629633 .reserved_frame => |index| self.long = .{ .load_frame = .{ .index = index } },
630634 else => unreachable,
631635 }
......@@ -887,6 +891,7 @@ pub fn generate(
887891 .args = undefined, // populated after `resolveCallingConventionValues`
888892 .va_info = undefined, // populated after `resolveCallingConventionValues`
889893 .ret_mcv = undefined, // populated after `resolveCallingConventionValues`
894 .err_ret_trace_reg = undefined, // populated after `resolveCallingConventionValues`
890895 .fn_type = fn_type,
891896 .src_loc = src_loc,
892897 .end_di_line = func.rbrace_line,
......@@ -935,6 +940,7 @@ pub fn generate(
935940
936941 function.args = call_info.args;
937942 function.ret_mcv = call_info.return_value;
943 function.err_ret_trace_reg = call_info.err_ret_trace_reg;
938944 function.frame_allocs.set(@intFromEnum(FrameIndex.ret_addr), .init(.{
939945 .size = Type.usize.abiSize(zcu),
940946 .alignment = Type.usize.abiAlignment(zcu).min(call_info.stack_align),
......@@ -962,6 +968,14 @@ pub fn generate(
962968 } },
963969 .x86_64_win => .{ .win64 = .{} },
964970 };
971 if (call_info.err_ret_trace_reg != .none) {
972 function.register_manager.getRegAssumeFree(call_info.err_ret_trace_reg, err_ret_trace_index);
973 try function.inst_tracking.putNoClobber(
974 gpa,
975 err_ret_trace_index,
976 .init(.{ .register = call_info.err_ret_trace_reg }),
977 );
978 }
965979
966980 function.gen() catch |err| switch (err) {
967981 error.CodegenFail => return error.CodegenFail,
......@@ -1042,6 +1056,7 @@ pub fn generateLazy(
10421056 .args = undefined,
10431057 .va_info = undefined,
10441058 .ret_mcv = undefined,
1059 .err_ret_trace_reg = undefined,
10451060 .fn_type = undefined,
10461061 .src_loc = src_loc,
10471062 .end_di_line = undefined, // no debug info yet
......@@ -2503,9 +2518,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
25032518 .optional_payload => try cg.airOptionalPayload(inst),
25042519 .unwrap_errunion_err => try cg.airUnwrapErrUnionErr(inst),
25052520 .unwrap_errunion_payload => try cg.airUnwrapErrUnionPayload(inst),
2506 .err_return_trace => try cg.airErrReturnTrace(inst),
2507 .set_err_return_trace => try cg.airSetErrReturnTrace(inst),
2508 .save_err_return_trace_index=> try cg.airSaveErrReturnTraceIndex(inst),
25092521
25102522 .wrap_optional => try cg.airWrapOptional(inst),
25112523 .wrap_errunion_payload => try cg.airWrapErrUnionPayload(inst),
......@@ -11236,12 +11248,46 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
1123611248 .wasm_memory_size => unreachable,
1123711249 .wasm_memory_grow => unreachable,
1123811250
11251 .err_return_trace => {
11252 const ert: Temp = .{ .index = err_ret_trace_index };
11253 try ert.moveTo(inst, cg);
11254 },
11255 .set_err_return_trace => {
11256 const un_op = air_datas[@intFromEnum(inst)].un_op;
11257 var ops = try cg.tempsFromOperands(inst, .{un_op});
11258 switch (ops[0].unwrap(cg)) {
11259 .ref => {
11260 const result = try cg.allocRegOrMem(err_ret_trace_index, true);
11261 try cg.genCopy(.usize, result, ops[0].tracking(cg).short, .{});
11262 tracking_log.debug("{} => {} (birth)", .{ err_ret_trace_index, result });
11263 cg.inst_tracking.putAssumeCapacityNoClobber(err_ret_trace_index, .init(result));
11264 },
11265 .temp => |temp_index| {
11266 const temp_tracking = temp_index.tracking(cg);
11267 tracking_log.debug("{} => {} (birth)", .{ err_ret_trace_index, temp_tracking.short });
11268 cg.inst_tracking.putAssumeCapacityNoClobber(err_ret_trace_index, temp_tracking.*);
11269 assert(cg.reuseTemp(err_ret_trace_index, temp_index.toIndex(), temp_tracking));
11270 },
11271 .err_ret_trace => unreachable,
11272 }
11273 },
11274
1123911275 .addrspace_cast => {
1124011276 const ty_op = air_datas[@intFromEnum(inst)].ty_op;
1124111277 var ops = try cg.tempsFromOperands(inst, .{ty_op.operand});
1124211278 try ops[0].moveTo(inst, cg);
1124311279 },
1124411280
11281 .save_err_return_trace_index => {
11282 const ty_pl = air_datas[@intFromEnum(inst)].ty_pl;
11283 const agg_ty = ty_pl.ty.toType();
11284 assert(agg_ty.containerLayout(zcu) != .@"packed");
11285 var ert: Temp = .{ .index = err_ret_trace_index };
11286 var res = try ert.load(.usize, .{ .disp = @intCast(agg_ty.structFieldOffset(ty_pl.payload, zcu)) }, cg);
11287 try ert.die(cg);
11288 try res.moveTo(inst, cg);
11289 },
11290
1124511291 .vector_store_elem => return cg.fail("TODO implement vector_store_elem", .{}),
1124611292
1124711293 .c_va_arg => try cg.airVaArg(inst),
......@@ -11697,7 +11743,7 @@ fn restoreState(self: *CodeGen, state: State, deaths: []const Air.Inst.Index, co
1169711743 const target_maybe_inst = if (state.free_registers.isSet(reg_index)) null else target_slot;
1169811744 if (std.debug.runtime_safety) if (target_maybe_inst) |target_inst|
1169911745 assert(self.inst_tracking.getIndex(target_inst).? < state.inst_tracking_len);
11700 if (opts.emit_instructions) {
11746 if (opts.emit_instructions and current_maybe_inst != target_maybe_inst) {
1170111747 if (current_maybe_inst) |current_inst|
1170211748 try self.inst_tracking.getPtr(current_inst).?.spill(self, current_inst);
1170311749 if (target_maybe_inst) |target_inst|
......@@ -11709,7 +11755,7 @@ fn restoreState(self: *CodeGen, state: State, deaths: []const Air.Inst.Index, co
1170911755 self.register_manager.freeRegIndex(reg_index);
1171011756 }
1171111757 if (target_maybe_inst) |target_inst| {
11712 self.register_manager.getRegIndexAssumeFree(reg_index, target_maybe_inst);
11758 self.register_manager.getRegIndexAssumeFree(reg_index, target_inst);
1171311759 self.inst_tracking.getPtr(target_inst).?.trackMaterialize(target_inst, reg_tracking);
1171411760 }
1171511761 } else if (target_maybe_inst) |_|
......@@ -11750,9 +11796,10 @@ pub fn spillEflagsIfOccupied(self: *CodeGen) !void {
1175011796 }
1175111797}
1175211798
11753pub fn spillCallerPreservedRegs(self: *CodeGen, cc: std.builtin.CallingConvention.Tag) !void {
11799pub fn spillCallerPreservedRegs(self: *CodeGen, cc: std.builtin.CallingConvention.Tag, ignore_reg: Register) !void {
1175411800 switch (cc) {
11755 inline .auto, .x86_64_sysv, .x86_64_win => |tag| try self.spillRegisters(abi.getCallerPreservedRegs(tag)),
11801 inline .auto, .x86_64_sysv, .x86_64_win => |tag| inline for (comptime abi.getCallerPreservedRegs(tag)) |reg|
11802 if (reg != ignore_reg) try self.register_manager.getKnownReg(reg, null),
1175611803 else => unreachable,
1175711804 }
1175811805}
......@@ -14406,22 +14453,6 @@ fn genUnwrapErrUnionPayloadPtrMir(
1440614453 return result;
1440714454}
1440814455
14409fn airErrReturnTrace(self: *CodeGen, inst: Air.Inst.Index) !void {
14410 _ = inst;
14411 return self.fail("TODO implement airErrReturnTrace for {}", .{self.target.cpu.arch});
14412 //return self.finishAir(inst, result, .{ .none, .none, .none });
14413}
14414
14415fn airSetErrReturnTrace(self: *CodeGen, inst: Air.Inst.Index) !void {
14416 _ = inst;
14417 return self.fail("TODO implement airSetErrReturnTrace for {}", .{self.target.cpu.arch});
14418}
14419
14420fn airSaveErrReturnTraceIndex(self: *CodeGen, inst: Air.Inst.Index) !void {
14421 _ = inst;
14422 return self.fail("TODO implement airSaveErrReturnTraceIndex for {}", .{self.target.cpu.arch});
14423}
14424
1442514456fn airWrapOptional(self: *CodeGen, inst: Air.Inst.Index) !void {
1442614457 const pt = self.pt;
1442714458 const zcu = pt.zcu;
......@@ -21188,7 +21219,7 @@ fn genCall(self: *CodeGen, info: union(enum) {
2118821219 }
2118921220
2119021221 try self.spillEflagsIfOccupied();
21191 try self.spillCallerPreservedRegs(fn_info.cc);
21222 try self.spillCallerPreservedRegs(fn_info.cc, call_info.err_ret_trace_reg);
2119221223
2119321224 // set stack arguments first because this can clobber registers
2119421225 // also clobber spill arguments as we go
......@@ -21273,6 +21304,24 @@ fn genCall(self: *CodeGen, info: union(enum) {
2127321304 else => unreachable,
2127421305 };
2127521306
21307 if (call_info.err_ret_trace_reg != .none) {
21308 if (self.inst_tracking.getPtr(err_ret_trace_index)) |err_ret_trace| {
21309 if (switch (err_ret_trace.short) {
21310 .register => |reg| call_info.err_ret_trace_reg != reg,
21311 else => true,
21312 }) {
21313 try self.register_manager.getReg(call_info.err_ret_trace_reg, err_ret_trace_index);
21314 try reg_locks.append(self.register_manager.lockReg(call_info.err_ret_trace_reg));
21315
21316 try self.genSetReg(call_info.err_ret_trace_reg, .usize, err_ret_trace.short, .{});
21317 err_ret_trace.trackMaterialize(err_ret_trace_index, .{
21318 .long = err_ret_trace.long,
21319 .short = .{ .register = call_info.err_ret_trace_reg },
21320 });
21321 }
21322 }
21323 }
21324
2127621325 // now we are free to set register arguments
2127721326 switch (call_info.return_value.long) {
2127821327 .none, .unreach => {},
......@@ -21447,6 +21496,17 @@ fn airRet(self: *CodeGen, inst: Air.Inst.Index, safety: bool) !void {
2144721496 else => unreachable,
2144821497 }
2144921498 self.ret_mcv.liveOut(self, inst);
21499
21500 if (self.err_ret_trace_reg != .none) {
21501 if (self.inst_tracking.getPtr(err_ret_trace_index)) |err_ret_trace| {
21502 if (switch (err_ret_trace.short) {
21503 .register => |reg| self.err_ret_trace_reg != reg,
21504 else => true,
21505 }) try self.genSetReg(self.err_ret_trace_reg, .usize, err_ret_trace.short, .{});
21506 err_ret_trace.liveOut(self, err_ret_trace_index);
21507 }
21508 }
21509
2145021510 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });
2145121511
2145221512 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
......@@ -21467,6 +21527,17 @@ fn airRetLoad(self: *CodeGen, inst: Air.Inst.Index) !void {
2146721527 else => unreachable,
2146821528 }
2146921529 self.ret_mcv.liveOut(self, inst);
21530
21531 if (self.err_ret_trace_reg != .none) {
21532 if (self.inst_tracking.getPtr(err_ret_trace_index)) |err_ret_trace| {
21533 if (switch (err_ret_trace.short) {
21534 .register => |reg| self.err_ret_trace_reg != reg,
21535 else => true,
21536 }) try self.genSetReg(self.err_ret_trace_reg, .usize, err_ret_trace.short, .{});
21537 err_ret_trace.liveOut(self, err_ret_trace_index);
21538 }
21539 }
21540
2147021541 try self.finishAir(inst, .unreach, .{ un_op, .none, .none });
2147121542
2147221543 // TODO optimization opportunity: figure out when we can emit this as a 2 byte instruction
......@@ -26098,8 +26169,13 @@ fn airTagName(self: *CodeGen, inst: Air.Inst.Index) !void {
2609826169 stack_frame_align.* = stack_frame_align.max(needed_call_frame.abi_align);
2609926170 }
2610026171
26172 const err_ret_trace_reg = if (zcu.comp.config.any_error_tracing) err_ret_trace_reg: {
26173 const param_gpr = abi.getCAbiIntParamRegs(.auto);
26174 break :err_ret_trace_reg param_gpr[param_gpr.len - 1];
26175 } else .none;
26176
2610126177 try self.spillEflagsIfOccupied();
26102 try self.spillCallerPreservedRegs(.auto);
26178 try self.spillCallerPreservedRegs(.auto, err_ret_trace_reg);
2610326179
2610426180 const param_regs = abi.getCAbiIntParamRegs(.auto);
2610526181
......@@ -28564,6 +28640,7 @@ const CallMCValues = struct {
2856428640 stack_align: InternPool.Alignment,
2856528641 gp_count: u32,
2856628642 fp_count: u32,
28643 err_ret_trace_reg: Register,
2856728644
2856828645 fn deinit(self: *CallMCValues, func: *CodeGen) void {
2856928646 func.gpa.free(self.args);
......@@ -28598,6 +28675,7 @@ fn resolveCallingConventionValues(
2859828675 .stack_align = undefined,
2859928676 .gp_count = 0,
2860028677 .fp_count = 0,
28678 .err_ret_trace_reg = .none,
2860128679 };
2860228680 errdefer self.gpa.free(result.args);
2860328681
......@@ -28842,6 +28920,11 @@ fn resolveCallingConventionValues(
2884228920 var param_x87 = abi.getCAbiX87ParamRegs(cc);
2884328921 var param_sse = abi.getCAbiSseParamRegs(cc, self.target);
2884428922
28923 if (zcu.comp.config.any_error_tracing) {
28924 result.err_ret_trace_reg = param_gpr[param_gpr.len - 1];
28925 param_gpr = param_gpr[0 .. param_gpr.len - 1];
28926 }
28927
2884528928 // Return values
2884628929 result.return_value = if (ret_ty.isNoReturn(zcu))
2884728930 .init(.unreach)
......@@ -29159,16 +29242,8 @@ fn typeOf(self: *CodeGen, inst: Air.Inst.Ref) Type {
2915929242}
2916029243
2916129244fn typeOfIndex(self: *CodeGen, inst: Air.Inst.Index) Type {
29162 const pt = self.pt;
29163 const zcu = pt.zcu;
2916429245 const temp: Temp = .{ .index = inst };
29165 return switch (temp.unwrap(self)) {
29166 .ref => switch (self.air.instructions.items(.tag)[@intFromEnum(inst)]) {
29167 .loop_switch_br => self.typeOf(self.air.unwrapSwitch(inst).operand),
29168 else => self.air.typeOfIndex(inst, &zcu.intern_pool),
29169 },
29170 .temp => temp.typeOf(self),
29171 };
29246 return temp.typeOf(self);
2917229247}
2917329248
2917429249fn intCompilerRtAbiName(int_bits: u32) u8 {
......@@ -29336,10 +29411,12 @@ const Temp = struct {
2933629411 fn unwrap(temp: Temp, cg: *CodeGen) union(enum) {
2933729412 ref: Air.Inst.Ref,
2933829413 temp: Index,
29414 err_ret_trace,
2933929415 } {
2934029416 switch (temp.index.unwrap()) {
2934129417 .ref => |ref| return .{ .ref = ref },
2934229418 .target => |target_index| {
29419 if (temp.index == err_ret_trace_index) return .err_ret_trace;
2934329420 const temp_index: Index = @enumFromInt(target_index);
2934429421 assert(temp_index.isValid(cg));
2934529422 return .{ .temp = temp_index };
......@@ -29349,14 +29426,18 @@ const Temp = struct {
2934929426
2935029427 fn typeOf(temp: Temp, cg: *CodeGen) Type {
2935129428 return switch (temp.unwrap(cg)) {
29352 .ref => |ref| cg.typeOf(ref),
29429 .ref => switch (cg.air.instructions.items(.tag)[@intFromEnum(temp.index)]) {
29430 .loop_switch_br => cg.typeOf(cg.air.unwrapSwitch(temp.index).operand),
29431 else => cg.air.typeOfIndex(temp.index, &cg.pt.zcu.intern_pool),
29432 },
2935329433 .temp => |temp_index| temp_index.typeOf(cg),
29434 .err_ret_trace => .usize,
2935429435 };
2935529436 }
2935629437
2935729438 fn isMut(temp: Temp, cg: *CodeGen) bool {
2935829439 return switch (temp.unwrap(cg)) {
29359 .ref => false,
29440 .ref, .err_ret_trace => false,
2936029441 .temp => |temp_index| switch (temp_index.tracking(cg).short) {
2936129442 .none,
2936229443 .unreach,
......@@ -29456,7 +29537,7 @@ const Temp = struct {
2945629537 fn toOffset(temp: *Temp, off: i32, cg: *CodeGen) !void {
2945729538 if (off == 0) return;
2945829539 switch (temp.unwrap(cg)) {
29459 .ref => {},
29540 .ref, .err_ret_trace => {},
2946029541 .temp => |temp_index| {
2946129542 const temp_tracking = temp_index.tracking(cg);
2946229543 switch (temp_tracking.short) {
......@@ -29617,6 +29698,7 @@ const Temp = struct {
2961729698 },
2961829699 }
2961929700 },
29701 .err_ret_trace => unreachable,
2962029702 }
2962129703 const new_temp = try temp.getLimb(limb_ty, limb_index, cg);
2962229704 try temp.die(cg);
......@@ -29633,7 +29715,7 @@ const Temp = struct {
2963329715 }
2963429716
2963529717 fn toReg(temp: *Temp, new_reg: Register, cg: *CodeGen) !bool {
29636 const val, const ty = val_ty: switch (temp.unwrap(cg)) {
29718 const val, const ty: Type = val_ty: switch (temp.unwrap(cg)) {
2963729719 .ref => |ref| .{ temp.tracking(cg).short, cg.typeOf(ref) },
2963829720 .temp => |temp_index| {
2963929721 const temp_tracking = temp_index.tracking(cg);
......@@ -29641,6 +29723,7 @@ const Temp = struct {
2964129723 temp_tracking.short.register == new_reg) return false;
2964229724 break :val_ty .{ temp_tracking.short, temp_index.typeOf(cg) };
2964329725 },
29726 .err_ret_trace => .{ temp.tracking(cg).short, .usize },
2964429727 };
2964529728 const new_temp_index = cg.next_temp_index;
2964629729 try cg.register_manager.getReg(new_reg, new_temp_index.toIndex());
......@@ -30167,7 +30250,7 @@ const Temp = struct {
3016730250
3016830251 fn moveTo(temp: Temp, inst: Air.Inst.Index, cg: *CodeGen) !void {
3016930252 if (cg.liveness.isUnused(inst)) try temp.die(cg) else switch (temp.unwrap(cg)) {
30170 .ref => {
30253 .ref, .err_ret_trace => {
3017130254 const result = try cg.allocRegOrMem(inst, true);
3017230255 try cg.genCopy(cg.typeOfIndex(inst), result, temp.tracking(cg).short, .{});
3017330256 tracking_log.debug("{} => {} (birth)", .{ inst, result });
......@@ -30184,7 +30267,7 @@ const Temp = struct {
3018430267
3018530268 fn die(temp: Temp, cg: *CodeGen) !void {
3018630269 switch (temp.unwrap(cg)) {
30187 .ref => {},
30270 .ref, .err_ret_trace => {},
3018830271 .temp => |temp_index| try temp_index.tracking(cg).die(cg, temp_index.toIndex()),
3018930272 }
3019030273 }
src/codegen/llvm.zig+14-12
......@@ -1497,8 +1497,7 @@ pub const Object = struct {
14971497 .unsigned => try attributes.addRetAttr(.zeroext, &o.builder),
14981498 };
14991499
1500 const err_return_tracing = Type.fromInterned(fn_info.return_type).isError(zcu) and
1501 comp.config.any_error_tracing;
1500 const err_return_tracing = fn_info.cc == .auto and comp.config.any_error_tracing;
15021501
15031502 const err_ret_trace: Builder.Value = if (err_return_tracing) param: {
15041503 const param = wip.arg(llvm_arg_i);
......@@ -2805,9 +2804,7 @@ pub const Object = struct {
28052804 debug_param_types.appendAssumeCapacity(try o.lowerDebugType(Type.void));
28062805 }
28072806
2808 if (Type.fromInterned(fn_info.return_type).isError(zcu) and
2809 zcu.comp.config.any_error_tracing)
2810 {
2807 if (fn_info.cc == .auto and zcu.comp.config.any_error_tracing) {
28112808 const ptr_ty = try pt.singleMutPtrType(try o.getStackTraceType());
28122809 debug_param_types.appendAssumeCapacity(try o.lowerDebugType(ptr_ty));
28132810 }
......@@ -2970,8 +2967,7 @@ pub const Object = struct {
29702967 llvm_arg_i += 1;
29712968 }
29722969
2973 const err_return_tracing = Type.fromInterned(fn_info.return_type).isError(zcu) and
2974 zcu.comp.config.any_error_tracing;
2970 const err_return_tracing = fn_info.cc == .auto and zcu.comp.config.any_error_tracing;
29752971
29762972 if (err_return_tracing) {
29772973 try attributes.addParamAttr(llvm_arg_i, .nonnull, &o.builder);
......@@ -3736,9 +3732,7 @@ pub const Object = struct {
37363732 try llvm_params.append(o.gpa, .ptr);
37373733 }
37383734
3739 if (Type.fromInterned(fn_info.return_type).isError(zcu) and
3740 zcu.comp.config.any_error_tracing)
3741 {
3735 if (fn_info.cc == .auto and zcu.comp.config.any_error_tracing) {
37423736 const ptr_ty = try pt.singleMutPtrType(try o.getStackTraceType());
37433737 try llvm_params.append(o.gpa, try o.lowerType(ptr_ty));
37443738 }
......@@ -5483,7 +5477,7 @@ pub const FuncGen = struct {
54835477 break :blk ret_ptr;
54845478 };
54855479
5486 const err_return_tracing = return_type.isError(zcu) and zcu.comp.config.any_error_tracing;
5480 const err_return_tracing = fn_info.cc == .auto and zcu.comp.config.any_error_tracing;
54875481 if (err_return_tracing) {
54885482 assert(self.err_ret_trace != .none);
54895483 try llvm_args.append(self.err_ret_trace);
......@@ -5762,6 +5756,8 @@ pub const FuncGen = struct {
57625756 const panic_nav = ip.getNav(panic_func.owner_nav);
57635757 const fn_info = zcu.typeToFunc(Type.fromInterned(panic_nav.typeOf(ip))).?;
57645758 const panic_global = try o.resolveLlvmFunction(panic_func.owner_nav);
5759 const has_err_trace = zcu.comp.config.any_error_tracing and fn_info.cc == .auto;
5760 if (has_err_trace) assert(fg.err_ret_trace != .none);
57655761 _ = try fg.wip.callIntrinsicAssumeCold();
57665762 _ = try fg.wip.call(
57675763 .normal,
......@@ -5769,7 +5765,13 @@ pub const FuncGen = struct {
57695765 .none,
57705766 panic_global.typeOf(&o.builder),
57715767 panic_global.toValue(&o.builder),
5772 &.{
5768 if (has_err_trace) &.{
5769 fg.err_ret_trace,
5770 msg_ptr.toValue(),
5771 try o.builder.intValue(llvm_usize, msg_len),
5772 try o.builder.nullValue(.ptr),
5773 null_opt_addr_global.toValue(),
5774 } else &.{
57735775 msg_ptr.toValue(),
57745776 try o.builder.intValue(llvm_usize, msg_len),
57755777 try o.builder.nullValue(.ptr),
src/target.zig+1-1
......@@ -708,7 +708,7 @@ pub inline fn backendSupportsFeature(backend: std.builtin.CompilerBackend, compt
708708 else => false,
709709 },
710710 .error_return_trace => switch (backend) {
711 .stage2_llvm => true,
711 .stage2_llvm, .stage2_x86_64 => true,
712712 else => false,
713713 },
714714 .is_named_enum_value => switch (backend) {
stage1/zig1.wasm
Binary files a/stage1/zig1.wasm and b/stage1/zig1.wasm differ
test/cases/compile_errors/anytype_param_requires_comptime.zig+1-1
......@@ -15,6 +15,6 @@ pub export fn entry() void {
1515// error
1616//
1717// :7:25: error: unable to resolve comptime value
18// :7:25: note: initializer of comptime-only struct 'tmp.S.foo__anon_165.C' must be comptime-known
18// :7:25: note: initializer of comptime-only struct 'tmp.S.foo__anon_441.C' must be comptime-known
1919// :4:16: note: struct requires comptime because of this field
2020// :4:16: note: types are not available at runtime
test/cases/compile_errors/bogus_method_call_on_slice.zig+1-1
......@@ -16,5 +16,5 @@ pub export fn entry2() void {
1616//
1717// :3:6: error: no field or member function named 'copy' in '[]const u8'
1818// :9:8: error: no field or member function named 'bar' in '@TypeOf(.{})'
19// :12:18: error: no field or member function named 'bar' in 'tmp.entry2__struct_169'
19// :12:18: error: no field or member function named 'bar' in 'tmp.entry2__struct_445'
2020// :12:6: note: struct declared here
test/cases/compile_errors/coerce_anon_struct.zig+1-1
......@@ -6,6 +6,6 @@ export fn foo() void {
66
77// error
88//
9// :4:16: error: expected type 'tmp.T', found 'tmp.foo__struct_158'
9// :4:16: error: expected type 'tmp.T', found 'tmp.foo__struct_434'
1010// :3:16: note: struct declared here
1111// :1:11: note: struct declared here
test/cases/compile_errors/implicit_cast_of_error_set_not_a_subset.zig+1-1
......@@ -12,5 +12,5 @@ fn foo(set1: Set1) void {
1212// backend=stage2
1313// target=native
1414//
15// :7:21: error: expected type 'error{A,C}', found 'error{A,B}'
15// :7:21: error: expected type 'error{C,A}', found 'error{A,B}'
1616// :7:21: note: 'error.B' not a member of destination error set