mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 05:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Sema: provide source location when analyzing panic handler

Browse source 
The panic handler decl_val was previously given a `unneeded` source
location, which was then added to the reference trace, resulting in a
crash if the source location was used in the reference trace. This
commit makes two trivial changes:

* Don't add unneeded source locations to the ref table (panic in debug, silently ignore in release)
* Pass a real source location when analyzing the panic handler
This commit is contained in:
mlugg 2023-08-13 09:54:58 +01:00 • committed by Andrew Kelley
parent 1054e67f01
commit 8f3ccbbe36
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Sema.zig
View file

@ -25202,7 +25202,7 @@ fn panicWithMsg(sema: *Sema, block: *Block, src: LazySrcLoc, msg_inst: Air.Inst.
try sema.prepareSimplePanic(block);
const panic_func = mod.funcInfo(mod.panic_func_index);
const panic_fn = try sema.analyzeDeclVal(block, .unneeded, panic_func.owner_decl);
const panic_fn = try sema.analyzeDeclVal(block, src, panic_func.owner_decl);
const null_stack_trace = Air.internedToRef(mod.null_stack_trace);
const opt_usize_ty = try mod.optionalType(.usize_type);
@ -30702,7 +30702,15 @@ fn addReferencedBy(
src: LazySrcLoc,
decl_index: Decl.Index,
) !void {
if (sema.mod.comp.reference_trace == @as(u32, 0)) return;
if (sema.mod.comp.reference_trace == 0) return;
if (src == .unneeded) {
// We can't use NeededSourceLocation, since sites handling that assume it means a compile
// error. Our long-term strategy here is to gradually transition from NeededSourceLocation
// into having more LazySrcLoc tags. In the meantime, let release compilers just ignore this
// reference (a slightly-incomplete error is better than a crash!), but trigger a panic in
// debug so we can fix this case.
if (std.debug.runtime_safety) unreachable else return;
}
try sema.mod.reference_table.put(sema.gpa, decl_index, .{
.referencer = block.src_decl,
.src = src,

17
test/cases/compile_errors/panic_has_source_location.zig Normal file
View file

@ -0,0 +1,17 @@
const std = @import("std");
export fn foo() void {
// This should appear in the reference trace
// (and definitely shouldn't crash due to an unneeded source location!)
@panic("oh no");
}
pub fn panic(_: []const u8, _: ?*std.builtin.StackTrace, _: ?usize) noreturn {
@compileError("panic");
}
// error
// backend=stage2
// target=native
//
// :10:5: error: panic