[libcxx-commits] [libcxx] 02f7369 - [libc++] Remove AppleClang woraround for __builtin_verbose_trap (#199171)

[via libcxx-commits]

Author: Nikolas Klauser
Date: 2026-05-24T06:50:50+02:00
New Revision: 02f736922cc852840941d6734df37ca47c2c41e4

URL: https://github.com/llvm/llvm-project/commit/02f736922cc852840941d6734df37ca47c2c41e4
DIFF: https://github.com/llvm/llvm-project/commit/02f736922cc852840941d6734df37ca47c2c41e4.diff

LOG: [libc++] Remove AppleClang woraround for __builtin_verbose_trap (#199171)

We've dropped support for AppleClang versions with a different
`__builtin_verbose_trap`, so we can remove the workaround.

Added: 
    

Modified: 
    libcxx/include/__verbose_trap

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__verbose_trap b/libcxx/include/__verbose_trap
index 13ea727738c3b..6bda3e208ad4e 100644
--- a/libcxx/include/__verbose_trap
+++ b/libcxx/include/__verbose_trap
@@ -19,14 +19,7 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 #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.
-// 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_VERBOSE_TRAP(message) __builtin_verbose_trap(message)
-#  else
-#    define _LIBCPP_VERBOSE_TRAP(message) __builtin_verbose_trap("libc++", message)
-#  endif
+#  define _LIBCPP_VERBOSE_TRAP(message) __builtin_verbose_trap("libc++", message)
 #else
 #  define _LIBCPP_VERBOSE_TRAP(message) ((void)message, __builtin_trap())
 #endif