[libcxx-commits] [libcxx] 1eba879 - [libc++] Fix AppleClang version number when checking for __builtin_verbose_trap support (#110161)

via libcxx-commits libcxx-commits at lists.llvm.org
Fri Sep 27 05:53:05 PDT 2024


Author: Louis Dionne
Date: 2024-09-27T08:53:02-04:00
New Revision: 1eba87904b0cbaaee82cfdb835528b85d99320ef

URL: https://github.com/llvm/llvm-project/commit/1eba87904b0cbaaee82cfdb835528b85d99320ef
DIFF: https://github.com/llvm/llvm-project/commit/1eba87904b0cbaaee82cfdb835528b85d99320ef.diff

LOG: [libc++] Fix AppleClang version number when checking for __builtin_verbose_trap support (#110161)

We should have been checking against 1700, not 17000, which was a typo.

Added: 
    

Modified: 
    libcxx/vendor/llvm/default_assertion_handler.in

Removed: 
    


################################################################################
diff  --git a/libcxx/vendor/llvm/default_assertion_handler.in b/libcxx/vendor/llvm/default_assertion_handler.in
index 8f37b9089ece83..e12ccccdaff37f 100644
--- a/libcxx/vendor/llvm/default_assertion_handler.in
+++ b/libcxx/vendor/llvm/default_assertion_handler.in
@@ -27,7 +27,7 @@
 // AppleClang shipped a slightly 
diff erent version of __builtin_verbose_trap from the upstream
 // version before upstream Clang actually got the builtin.
 // TODO: Remove once AppleClang supports the two-arguments version of the builtin.
-#    if defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER < 17000
+#    if defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER < 1700
 #      define _LIBCPP_ASSERTION_HANDLER(message) __builtin_verbose_trap(message)
 #    else
 #      define _LIBCPP_ASSERTION_HANDLER(message) __builtin_verbose_trap("libc++", message)


        


More information about the libcxx-commits mailing list