[llvm] r368896 - Un-break the bots

[JF Bastien via llvm-commits]

Author: jfb
Date: Wed Aug 14 11:17:06 2019
New Revision: 368896

URL: http://llvm.org/viewvc/llvm-project?rev=368896&view=rev
Log:
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.

Modified:
    llvm/trunk/include/llvm/Support/type_traits.h

Modified: llvm/trunk/include/llvm/Support/type_traits.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/type_traits.h?rev=368896&r1=368895&r2=368896&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/type_traits.h (original)
+++ llvm/trunk/include/llvm/Support/type_traits.h Wed Aug 14 11:17:06 2019
@@ -192,7 +192,10 @@ class is_trivially_copyable<T*> : public
 // 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)