Commit 2afc689060e1d14e039f3c439d42f22ba09768a3 | zig

author	Jacob Young <jacobly@ziglang.org> 2023-06-11 04:14:17-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-06-11 03:01:37-07:00
log	2afc689060e1d14e039f3c439d42f22ba09768a3
tree	d21f693ca782fb5ded76ffba090e0c0e7dbe747c
parent	7507a76879bbfb53c170f130ea836b10bc2a42e1

Sema: fix condition for emitting noreturn safety check

1 files changed, 10 insertions(+), 9 deletions(-)

src
- Sema.zig

src/Sema.zig+10-9

 @@ -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: {
+            if (try sema.resolveMaybeUndefVal(func)) |func_val| {
-                const func_val = (try sema.resolveMaybeUndefVal(func)) orelse break :check;
                 switch (mod.intern_pool.indexToKey(func_val.toIntern())) {
-                    .func, .extern_func, .ptr => {
+                    .func => break :skip_safety,
-                        _ = try block.addNoOp(.unreach);
+                    .ptr => |ptr| switch (ptr.addr) {
-                        return Air.Inst.Ref.unreachable_value;
+                        .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;
         }