From f135df7c2ccca1982cac6bf1f77317f4b97ab56d Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Fri, 17 Nov 2023 12:46:09 +0100 Subject: [PATCH] libsanitizer: fix build on darwin Upstream report of the issue at https://github.com/llvm/llvm-project/issues/72639 libsanitizer/ChangeLog: * asan/asan_mac.cpp: Protect Apple blocks behind the MISSING_BLOCKS_SUPPORT macro. --- libsanitizer/asan/asan_mac.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libsanitizer/asan/asan_mac.cpp b/libsanitizer/asan/asan_mac.cpp index 5d5146e0cde..6252fa20d5e 100644 --- a/libsanitizer/asan/asan_mac.cpp +++ b/libsanitizer/asan/asan_mac.cpp @@ -139,9 +139,11 @@ typedef void (*dispatch_mach_handler_function_t)(void *context, dispatch_mach_reason reason, dispatch_mach_msg_t message, mach_error_t error); +#if !defined(MISSING_BLOCKS_SUPPORT) typedef void (^dispatch_mach_handler_t)(dispatch_mach_reason reason, dispatch_mach_msg_t message, mach_error_t error); +#endif // A wrapper for the ObjC blocks used to support libdispatch. typedef struct { -- 2.39.3 (Apple Git-145)