[llvm] Use std::enable_if_t (NFC)

diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h
index 2238059..609534c 100644 (file)
--- a/llvm/include/llvm/ADT/STLExtras.h
+++ b/llvm/include/llvm/ADT/STLExtras.h
@@ -1877,9 +1877,9 @@ void replace(Container &Cont, typename Container::iterator ContIt,
 /// \endcode
 template <typename ForwardIterator, typename UnaryFunctor,
           typename NullaryFunctor,
-          typename = typename std::enable_if<
+          typename = std::enable_if_t<
               !std::is_constructible<StringRef, UnaryFunctor>::value &&
-              !std::is_constructible<StringRef, NullaryFunctor>::value>::type>
+              !std::is_constructible<StringRef, NullaryFunctor>::value>>
 inline void interleave(ForwardIterator begin, ForwardIterator end,
                        UnaryFunctor each_fn, NullaryFunctor between_fn) {
   if (begin == end)
@@ -1893,9 +1893,9 @@ inline void interleave(ForwardIterator begin, ForwardIterator end,
 }
 
 template <typename Container, typename UnaryFunctor, typename NullaryFunctor,
-          typename = typename std::enable_if<
+          typename = std::enable_if_t<
               !std::is_constructible<StringRef, UnaryFunctor>::value &&
-              !std::is_constructible<StringRef, NullaryFunctor>::value>::type>
+              !std::is_constructible<StringRef, NullaryFunctor>::value>>
 inline void interleave(const Container &c, UnaryFunctor each_fn,
                        NullaryFunctor between_fn) {
   interleave(c.begin(), c.end(), each_fn, between_fn);

diff --git a/llvm/include/llvm/ADT/fallible_iterator.h b/llvm/include/llvm/ADT/fallible_iterator.h
index a196d88..b42f62b 100644 (file)
--- a/llvm/include/llvm/ADT/fallible_iterator.h
+++ b/llvm/include/llvm/ADT/fallible_iterator.h
@@ -68,7 +68,7 @@ namespace llvm {
 template <typename Underlying> class fallible_iterator {
 private:
   template <typename T>
-  using enable_if_struct_deref_supported = std::enable_if<
+  using enable_if_struct_deref_supported = std::enable_if_t<
       !std::is_void<decltype(std::declval<T>().operator->())>::value,
       decltype(std::declval<T>().operator->())>;
 
@@ -104,14 +104,14 @@ public:
   /// Forward structure dereference to the underlying iterator (if the
   /// underlying iterator supports it).
   template <typename T = Underlying>
-  typename enable_if_struct_deref_supported<T>::type operator->() {
+  enable_if_struct_deref_supported<T> operator->() {
     return I.operator->();
   }
 
   /// Forward const structure dereference to the underlying iterator (if the
   /// underlying iterator supports it).
   template <typename T = Underlying>
-  typename enable_if_struct_deref_supported<const T>::type operator->() const {
+  enable_if_struct_deref_supported<const T> operator->() const {
     return I.operator->();
   }
 

diff --git a/llvm/include/llvm/Support/HashBuilder.h b/llvm/include/llvm/Support/HashBuilder.h
index 51ca97e..5df0bc2 100644 (file)
--- a/llvm/include/llvm/Support/HashBuilder.h
+++ b/llvm/include/llvm/Support/HashBuilder.h
@@ -281,7 +281,7 @@ public:
   /// add(Arg2)
   /// ```
   template <typename T, typename... Ts>
-  typename std::enable_if<(sizeof...(Ts) >= 1), HashBuilderImpl &>::type
+  std::enable_if_t<(sizeof...(Ts) >= 1), HashBuilderImpl &>
   add(const T &FirstArg, const Ts &...Args) {
     add(FirstArg);
     add(Args...);

diff --git a/llvm/include/llvm/Support/TypeSize.h b/llvm/include/llvm/Support/TypeSize.h
index 0b40e97..0777005 100644 (file)
--- a/llvm/include/llvm/Support/TypeSize.h
+++ b/llvm/include/llvm/Support/TypeSize.h
@@ -211,7 +211,7 @@ protected:
   }
 
   template <typename U = ScalarTy>
-  friend typename std::enable_if<std::is_signed<U>::value, LeafTy>::type
+  friend std::enable_if_t<std::is_signed<U>::value, LeafTy>
   operator-(const LeafTy &LHS) {
     LeafTy Copy = LHS;
     return Copy *= -1;

diff --git a/llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp b/llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp
index 70964b3..24d5aea 100644 (file)
--- a/llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp
+++ b/llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp
@@ -78,24 +78,24 @@ private:
                                   IRBuilderBase &B, Value *Row, Value *Col,
                                   Value *Ptr, Value *Stride, Value *Tile);
   template <Intrinsic::ID IntrID>
-  typename std::enable_if<IntrID == Intrinsic::x86_tdpbssd_internal ||
-                              IntrID == Intrinsic::x86_tdpbsud_internal ||
-                              IntrID == Intrinsic::x86_tdpbusd_internal ||
-                              IntrID == Intrinsic::x86_tdpbuud_internal ||
-                              IntrID == Intrinsic::x86_tdpbf16ps_internal,
-                          Value *>::type
+  std::enable_if_t<IntrID == Intrinsic::x86_tdpbssd_internal ||
+                       IntrID == Intrinsic::x86_tdpbsud_internal ||
+                       IntrID == Intrinsic::x86_tdpbusd_internal ||
+                       IntrID == Intrinsic::x86_tdpbuud_internal ||
+                       IntrID == Intrinsic::x86_tdpbf16ps_internal,
+                   Value *>
   createTileDPLoops(BasicBlock *Start, BasicBlock *End, IRBuilderBase &B,
                     Value *Row, Value *Col, Value *K, Value *Acc, Value *LHS,
                     Value *RHS);
   template <bool IsTileLoad>
   bool lowerTileLoadStore(Instruction *TileLoadStore);
   template <Intrinsic::ID IntrID>
-  typename std::enable_if<IntrID == Intrinsic::x86_tdpbssd_internal ||
-                              IntrID == Intrinsic::x86_tdpbsud_internal ||
-                              IntrID == Intrinsic::x86_tdpbusd_internal ||
-                              IntrID == Intrinsic::x86_tdpbuud_internal ||
-                              IntrID == Intrinsic::x86_tdpbf16ps_internal,
-                          bool>::type
+  std::enable_if_t<IntrID == Intrinsic::x86_tdpbssd_internal ||
+                       IntrID == Intrinsic::x86_tdpbsud_internal ||
+                       IntrID == Intrinsic::x86_tdpbusd_internal ||
+                       IntrID == Intrinsic::x86_tdpbuud_internal ||
+                       IntrID == Intrinsic::x86_tdpbf16ps_internal,
+                   bool>
   lowerTileDP(Instruction *TileDP);
   bool lowerTileZero(Instruction *TileZero);
 };
@@ -235,12 +235,12 @@ Value *X86LowerAMXIntrinsics::createTileLoadStoreLoops(
 }
 
 template <Intrinsic::ID IntrID>
-typename std::enable_if<IntrID == Intrinsic::x86_tdpbssd_internal ||
-                            IntrID == Intrinsic::x86_tdpbsud_internal ||
-                            IntrID == Intrinsic::x86_tdpbusd_internal ||
-                            IntrID == Intrinsic::x86_tdpbuud_internal ||
-                            IntrID == Intrinsic::x86_tdpbf16ps_internal,
-                        Value *>::type
+std::enable_if_t<IntrID == Intrinsic::x86_tdpbssd_internal ||
+                     IntrID == Intrinsic::x86_tdpbsud_internal ||
+                     IntrID == Intrinsic::x86_tdpbusd_internal ||
+                     IntrID == Intrinsic::x86_tdpbuud_internal ||
+                     IntrID == Intrinsic::x86_tdpbf16ps_internal,
+                 Value *>
 X86LowerAMXIntrinsics::createTileDPLoops(BasicBlock *Start, BasicBlock *End,
                                          IRBuilderBase &B, Value *Row,
                                          Value *Col, Value *K, Value *Acc,
@@ -469,12 +469,12 @@ X86LowerAMXIntrinsics::createTileDPLoops(BasicBlock *Start, BasicBlock *End,
 }
 
 template <Intrinsic::ID IntrID>
-typename std::enable_if<IntrID == Intrinsic::x86_tdpbssd_internal ||
-                            IntrID == Intrinsic::x86_tdpbsud_internal ||
-                            IntrID == Intrinsic::x86_tdpbusd_internal ||
-                            IntrID == Intrinsic::x86_tdpbuud_internal ||
-                            IntrID == Intrinsic::x86_tdpbf16ps_internal,
-                        bool>::type
+std::enable_if_t<IntrID == Intrinsic::x86_tdpbssd_internal ||
+                     IntrID == Intrinsic::x86_tdpbsud_internal ||
+                     IntrID == Intrinsic::x86_tdpbusd_internal ||
+                     IntrID == Intrinsic::x86_tdpbuud_internal ||
+                     IntrID == Intrinsic::x86_tdpbf16ps_internal,
+                 bool>
 X86LowerAMXIntrinsics::lowerTileDP(Instruction *TileDP) {
   Value *M, *N, *K, *C, *A, *B;
   match(TileDP, m_Intrinsic<IntrID>(m_Value(M), m_Value(N), m_Value(K),

diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index 34e2274..c073ad8 100644 (file)
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -6947,13 +6947,12 @@ namespace {
 /// value, otherwise.
 struct ValueSelect {
   template <typename U>
-  static typename std::enable_if<std::is_same<Value *, U>::value, Value *>::type
+  static std::enable_if_t<std::is_same<Value *, U>::value, Value *>
   get(Value *V) {
     return V;
   }
   template <typename U>
-  static typename std::enable_if<!std::is_same<Value *, U>::value, U>::type
-  get(Value *) {
+  static std::enable_if_t<!std::is_same<Value *, U>::value, U> get(Value *) {
     return U();
   }
 };