From 9eca5ed7900a9ebc980e413a4be2cf608922491b Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 3 Sep 2022 11:17:44 -0700 Subject: [PATCH] [llvm] Use std::enable_if_t (NFC) --- llvm/include/llvm/ADT/STLExtras.h | 8 ++--- llvm/include/llvm/ADT/fallible_iterator.h | 6 ++-- llvm/include/llvm/Support/HashBuilder.h | 2 +- llvm/include/llvm/Support/TypeSize.h | 2 +- llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp | 48 ++++++++++++------------- llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp | 5 ++- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h index 2238059..609534c 100644 --- 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 ::value && - !std::is_constructible::value>::type> + !std::is_constructible::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 ::value && - !std::is_constructible::value>::type> + !std::is_constructible::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 --- a/llvm/include/llvm/ADT/fallible_iterator.h +++ b/llvm/include/llvm/ADT/fallible_iterator.h @@ -68,7 +68,7 @@ namespace llvm { template class fallible_iterator { private: template - using enable_if_struct_deref_supported = std::enable_if< + using enable_if_struct_deref_supported = std::enable_if_t< !std::is_void().operator->())>::value, decltype(std::declval().operator->())>; @@ -104,14 +104,14 @@ public: /// Forward structure dereference to the underlying iterator (if the /// underlying iterator supports it). template - typename enable_if_struct_deref_supported::type operator->() { + enable_if_struct_deref_supported operator->() { return I.operator->(); } /// Forward const structure dereference to the underlying iterator (if the /// underlying iterator supports it). template - typename enable_if_struct_deref_supported::type operator->() const { + enable_if_struct_deref_supported 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 --- a/llvm/include/llvm/Support/HashBuilder.h +++ b/llvm/include/llvm/Support/HashBuilder.h @@ -281,7 +281,7 @@ public: /// add(Arg2) /// ``` template - 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 --- a/llvm/include/llvm/Support/TypeSize.h +++ b/llvm/include/llvm/Support/TypeSize.h @@ -211,7 +211,7 @@ protected: } template - friend typename std::enable_if::value, LeafTy>::type + friend std::enable_if_t::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 --- 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 - typename std::enable_if::type + std::enable_if_t createTileDPLoops(BasicBlock *Start, BasicBlock *End, IRBuilderBase &B, Value *Row, Value *Col, Value *K, Value *Acc, Value *LHS, Value *RHS); template bool lowerTileLoadStore(Instruction *TileLoadStore); template - typename std::enable_if::type + std::enable_if_t lowerTileDP(Instruction *TileDP); bool lowerTileZero(Instruction *TileZero); }; @@ -235,12 +235,12 @@ Value *X86LowerAMXIntrinsics::createTileLoadStoreLoops( } template -typename std::enable_if::type +std::enable_if_t 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 -typename std::enable_if::type +std::enable_if_t X86LowerAMXIntrinsics::lowerTileDP(Instruction *TileDP) { Value *M, *N, *K, *C, *A, *B; match(TileDP, m_Intrinsic(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 --- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -6947,13 +6947,12 @@ namespace { /// value, otherwise. struct ValueSelect { template - static typename std::enable_if::value, Value *>::type + static std::enable_if_t::value, Value *> get(Value *V) { return V; } template - static typename std::enable_if::value, U>::type - get(Value *) { + static std::enable_if_t::value, U> get(Value *) { return U(); } }; -- 2.7.4