From: JF Bastien <jfbastien@apple.com>
Date: Wed, 14 Aug 2019 18:17:06 +0000 (+0000)
Subject: Un-break the bots
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21ea5fbf1e750b73f5aa5c12502d227d0324f1c8;p=llvm

Un-break the bots

Some bots can't find is_final despite it being in C++14. Leave the code as it was for now, fix it later when the bots are happy.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368896 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Support/type_traits.h b/include/llvm/Support/type_traits.h
index 403bac7260b..b580f25fd18 100644
--- a/include/llvm/Support/type_traits.h
+++ b/include/llvm/Support/type_traits.h
@@ -192,7 +192,10 @@ class is_trivially_copyable<T*> : public std::true_type {
 // If the compiler supports detecting whether a class is final, define
 // an LLVM_IS_FINAL macro. If it cannot be defined properly, this
 // macro will be left undefined.
-#if defined(__cplusplus) || defined(_MSC_VER)
+//
+// FIXME we should just use std::is_final directly, but some bots are currently
+// broken.
+#if __cplusplus >= 201402L || defined(_MSC_VER)
 #define LLVM_IS_FINAL(Ty) std::is_final<Ty>()
 #elif __has_feature(is_final) || LLVM_GNUC_PREREQ(4, 7, 0)
 #define LLVM_IS_FINAL(Ty) __is_final(Ty)