motiejus/zig
1
Fork 0
Code Releases Activity

Sema: fix condition for emitting noreturn safety check

Browse Source
This commit is contained in:
Jacob Young
2023-06-11 04:14:17 -04:00
committed by Andrew Kelley
parent 7507a76879
commit 2afc689060
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Sema.zig
View File

@@ -7170,23 +7170,24 @@ fn analyzeCall(
try sema.ensureResultUsed(block, sema.typeOf(func_inst), call_src);
}
return sema.handleTailCall(block, call_src, func_ty, func_inst);
} else if (block.wantSafety() and func_ty_info.return_type == .noreturn_type) {
}
if (block.wantSafety() and func_ty_info.return_type == .noreturn_type) skip_safety: {
// Function pointers and extern functions aren't guaranteed to
// actually be noreturn so we add a safety check for them.
check: {
const func_val = (try sema.resolveMaybeUndefVal(func)) orelse break :check;
if (try sema.resolveMaybeUndefVal(func)) |func_val| {
switch (mod.intern_pool.indexToKey(func_val.toIntern())) {
.func, .extern_func, .ptr => {
_ = try block.addNoOp(.unreach);
return Air.Inst.Ref.unreachable_value;
.func => break :skip_safety,
.ptr => |ptr| switch (ptr.addr) {
.decl => |decl| if (!mod.declPtr(decl).isExtern(mod)) break :skip_safety,
else => {},
},
else => break :check,
else => {},
}
}
try sema.safetyPanic(block, .noreturn_returned);
return Air.Inst.Ref.unreachable_value;
} else if (func_ty_info.return_type == .noreturn_type) {
}
if (func_ty_info.return_type == .noreturn_type) {
_ = try block.addNoOp(.unreach);
return Air.Inst.Ref.unreachable_value;
}