Commit d8e10145 authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook GitHub Bot

Fix the Apple LLVM version when disabling tests for Xcode 12

Summary: [Folly] Fix the Apple LLVM version when disabling is-constexpr-default-constructible test expectations over types with non-trivial destructors for Xcode 12.

Differential Revision: D23917973

fbshipit-source-id: 1238ec5a53ba0ff73afd67f81ad2868f37196eaa
parent 137a7249
...@@ -454,6 +454,12 @@ constexpr auto kIsWindows = true; ...@@ -454,6 +454,12 @@ constexpr auto kIsWindows = true;
constexpr auto kIsWindows = false; constexpr auto kIsWindows = false;
#endif #endif
#if defined(__APPLE__)
constexpr auto kIsApple = true;
#else
constexpr auto kIsApple = false;
#endif
constexpr bool kIsAppleIOS = FOLLY_APPLE_IOS == 1; constexpr bool kIsAppleIOS = FOLLY_APPLE_IOS == 1;
constexpr bool kIsAppleMacOS = FOLLY_APPLE_MACOS == 1; constexpr bool kIsAppleMacOS = FOLLY_APPLE_MACOS == 1;
constexpr bool kIsAppleTVOS = FOLLY_APPLE_TVOS == 1; constexpr bool kIsAppleTVOS = FOLLY_APPLE_TVOS == 1;
......
...@@ -436,7 +436,7 @@ TEST(Traits, is_constexpr_default_constructible) { ...@@ -436,7 +436,7 @@ TEST(Traits, is_constexpr_default_constructible) {
// under clang 10, crash: https://bugs.llvm.org/show_bug.cgi?id=47620 // under clang 10, crash: https://bugs.llvm.org/show_bug.cgi?id=47620
// and, with assertions disabled, expectation failures showing compiler // and, with assertions disabled, expectation failures showing compiler
// deviation from the language spec // deviation from the language spec
if (kClangVerMajor != 10) { if (kClangVerMajor != (kIsApple ? 12 : 10)) {
struct NonTrivialDtor { struct NonTrivialDtor {
~NonTrivialDtor() {} ~NonTrivialDtor() {}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment