From 6fbbb093aea52928bb8df4a2212f44ac3bac7733 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 3 Apr 2021 12:20:13 +0200 Subject: [PATCH] Don't check that std::pair is trivially copyable on FreeBSD As FreeBSD already used libc++ before it changed its ABI, we still use the non-trivially copyable version of std::pair, which used to be exposed via `_LIBCPP_TRIVIAL_PAIR_COPY_CTOR`, but more recently via `_LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR`. Reviewed By: serge-sans-paille Differential Revision: https://reviews.llvm.org/D99834 --- llvm/unittests/Support/TypeTraitsTest.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/llvm/unittests/Support/TypeTraitsTest.cpp b/llvm/unittests/Support/TypeTraitsTest.cpp index 15a38b8..cd78f090 100644 --- a/llvm/unittests/Support/TypeTraitsTest.cpp +++ b/llvm/unittests/Support/TypeTraitsTest.cpp @@ -110,7 +110,9 @@ TEST(Triviality, ADT) { TrivialityTester, false, false>(); TrivialityTester, false, false>(); +#if !defined(_LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR) TrivialityTester, true, true>(); +#endif TrivialityTester, false, false>(); TrivialityTester(); TrivialityTester, true, true>(); -- 2.7.4