From 1fb306c56be291cd5dbd038a23705f81d3013114 Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Fri, 29 May 2026 01:25:35 +0900 Subject: [PATCH] ubsan_rt: fix wrong prototypes for __ubsan_handle_nonnull_return_v1{_abort} The prototypes in LLVM project are: ```c++ void __ubsan::__ubsan_handle_nonnull_return_v1(NonNullReturnData *Data, SourceLocation *LocPtr); void __ubsan::__ubsan_handle_nonnull_return_v1_abort(NonNullReturnData *Data, SourceLocation *LocPtr); ``` --- lib/ubsan_rt.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ubsan_rt.zig b/lib/ubsan_rt.zig index 59278a91161d4ef780539de147c94d54a67aa320..b6fdc5f5aeedc901213ed96c14710904e6ee6336 100644 --- a/lib/ubsan_rt.zig +++ b/lib/ubsan_rt.zig @@ -492,10 +492,10 @@ const NonNullReturnData = extern struct { attribute_loc: SourceLocation, }; -fn nonNullReturnAbort(data: *const NonNullReturnData) callconv(.c) noreturn { - nonNullReturn(data); +fn nonNullReturnAbort(data: *const NonNullReturnData, where: *const SourceLocation) callconv(.c) noreturn { + nonNullReturn(data, where); } -fn nonNullReturn(_: *const NonNullReturnData) callconv(.c) noreturn { +fn nonNullReturn(_: *const NonNullReturnData, _: *const SourceLocation) callconv(.c) noreturn { panic(@returnAddress(), "null pointer returned from function declared to never return null", .{}); } -- 2.54.0