From: Dimitry Andric <dimitry@andric.com>
Date: Wed, 7 Apr 2021 16:51:53 +0000 (+0200)
Subject: Avoid testing for libc++ internal macros after D99834
X-Git-Tag: llvmorg-14-init~10216
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3e9b07a7d1cb543dcd8652a49a3613e6c9d993a;p=platform%2Fupstream%2Fllvm.git

Avoid testing for libc++ internal macros after D99834

As D99834 was meant specifically for FreeBSD, which still uses the older
non-trivial std::pair copy constructors, test for `__FreeBSD__` instead
of relying on a macro which is an internal detail of libc++.

Noted by Louis Dionne.
---

diff --git a/llvm/unittests/Support/TypeTraitsTest.cpp b/llvm/unittests/Support/TypeTraitsTest.cpp
index cd78f090..bd21343 100644
--- a/llvm/unittests/Support/TypeTraitsTest.cpp
+++ b/llvm/unittests/Support/TypeTraitsTest.cpp
@@ -110,7 +110,7 @@ TEST(Triviality, ADT) {
   TrivialityTester<llvm::SmallString<8>, false, false>();
 
   TrivialityTester<std::function<int()>, false, false>();
-#if !defined(_LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR)
+#if !defined(__FreeBSD__)
   TrivialityTester<std::pair<int, bool>, true, true>();
 #endif
   TrivialityTester<llvm::unique_function<int()>, false, false>();