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

Louis Dionne via libcxx-commits libcxx-commits at lists.llvm.org
Thu Sep 26 12:56:20 PDT 2024


https://github.com/ldionne created https://github.com/llvm/llvm-project/pull/110161

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

>From 19aa11f3e418677fdf5ce36df92775a5403eb5a0 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Thu, 26 Sep 2024 15:54:50 -0400
Subject: [PATCH] [libc++] Fix AppleClang version number when checking for
 __builtin_verbose_trap support

We should have been checking against 1700, not 17000, which was a typo.
---
 libcxx/vendor/llvm/default_assertion_handler.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 different 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