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

[via libcxx-commits]

llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-libcxx

Author: Nikolas Klauser (philnik777)

<details>
<summary>Changes</summary>

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


---
Full diff: https://github.com/llvm/llvm-project/pull/199171.diff


1 Files Affected:

- (modified) libcxx/include/__verbose_trap (+1-8) 


``````````diff
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 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 < 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

``````````

</details>


https://github.com/llvm/llvm-project/pull/199171