type_traits: conditionally enable deprecated checks

Author: MaxDesiatov

include/swift/Basic/type_traits.h

@@ -44,9 +44,11 @@ template<typename T>
 struct IsTriviallyConstructible {
 #if defined(_LIBCPP_VERSION) || SWIFT_COMPILER_IS_MSVC
   // libc++ and MSVC implement is_trivially_constructible.
-  static const bool value = std::is_trivially_constructible<T>::value;
-#elif __has_feature(__is_trivially_constructible) || __GNUC__ >= 5
+  static const bool value = std::is_trivially_constructible<T>::value;  
+#elif __has_feature(is_trivially_constructible)
   static const bool value = __is_trivially_constructible(T);
+#elif __has_feature(has_trivial_constructor) || __GNUC__ >= 5
+  static const bool value = __has_trivial_constructor(T);
 #else
 #  error "Not implemented"
 #endif
@@ -57,8 +59,10 @@ struct IsTriviallyDestructible {
 #if defined(_LIBCPP_VERSION) || SWIFT_COMPILER_IS_MSVC
   // libc++ and MSVC implement is_trivially_destructible.
   static const bool value = std::is_trivially_destructible<T>::value;
-#elif __has_feature(__is_trivially_destructible) || __GNUC__ >= 5
+#elif __has_feature(is_trivially_destructible)
   static const bool value = __is_trivially_destructible(T);
+#elif __has_feature(has_trivial_destructor) || __GNUC__ >= 5
+   static const bool value = __has_trivial_destructor(T);
 #else
 #  error "Not implemented"
 #endif