[llvm-branch-commits] [libcxx] 53010fc - [libc++] Fix AppleClang version number when checking for __builtin_verbose_trap support (#110161)

[Tobias Hieta via llvm-branch-commits]

Author: Louis Dionne
Date: 2024-10-01T08:56:18+02:00
New Revision: 53010fcf66b5a84153bce6b7e866edb596e59cf4

URL: https://github.com/llvm/llvm-project/commit/53010fcf66b5a84153bce6b7e866edb596e59cf4
DIFF: https://github.com/llvm/llvm-project/commit/53010fcf66b5a84153bce6b7e866edb596e59cf4.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.

(cherry picked from commit 1eba87904b0cbaaee82cfdb835528b85d99320ef)

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 3b6d6b2cca53c2..e12ccccdaff37f 100644
--- a/libcxx/vendor/llvm/default_assertion_handler.in
+++ b/libcxx/vendor/llvm/default_assertion_handler.in
@@ -26,7 +26,8 @@
 #  if __has_builtin(__builtin_verbose_trap)
 // AppleClang shipped a slightly 
diff erent version of __builtin_verbose_trap from the upstream
 // version before upstream Clang actually got the builtin.
-#    if defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER < 17000
+// TODO: Remove once AppleClang supports the two-arguments version of the builtin.
+#    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)