RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Revert "ADT: Tidy up ilist_traits static asserts, NFC"

Browse Source 
This reverts commit r279012.
r278974 broke some bots, I have to revert this to get to it.

llvm-svn: 279052
This commit is contained in:
Diana Picus 2016-08-18 11:17:47 +00:00
parent 21ab1f4274
commit 746d46ed86
2 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/llvm/ADT/ilist.h
View File

@ -83,37 +83,34 @@ template <class T> T &make();
/// Type trait to check for a traits class that has a getNext member (as a
/// canary for any of the ilist_nextprev_traits API).
template <class TraitsT, class NodeT> class HasGetNext {
template <class TraitsT, class NodeT> struct HasGetNext {
typedef char Yes[1];
typedef char No[2];
template <size_t N> struct SFINAE {};
template <class U>
static Yes &test(U *I, decltype(I->getNext(&make<NodeT>())) * = 0);
template <class> static No &test(...);
static Yes &hasGetNext(
SFINAE<sizeof(static_cast<NodeT *>(make<U>().getNext(&make<NodeT>())))>
* = 0);
template <class U> static No &hasGetNext(...);
public:
static const bool value = sizeof(test<TraitsT>(nullptr)) == sizeof(Yes);
static const bool value = sizeof(hasGetNext<TraitsT>(nullptr)) == sizeof(Yes);
};
/// Type trait to check for a traits class that has a createSentinel member (as
/// a canary for any of the ilist_sentinel_traits API).
template <class TraitsT> class HasCreateSentinel {
template <class TraitsT> struct HasCreateSentinel {
typedef char Yes[1];
typedef char No[2];
template <size_t N> struct SFINAE {};
template <class U>
static Yes &test(U *I, decltype(I->createSentinel()) * = 0);
template <class U> static No &test(...);
static Yes &
hasCreateSentinel(SFINAE<sizeof(make<U>().createSentinel())> * = 0);
template <class U> static No &hasCreateSentinel(...);
public:
static const bool value = sizeof(test<TraitsT>(nullptr)) == sizeof(Yes);
};
template <class TraitsT, class NodeT> struct HasObsoleteCustomization {
static const bool value =
HasGetNext<TraitsT, NodeT>::value || HasCreateSentinel<TraitsT>::value;
sizeof(hasCreateSentinel<TraitsT>(nullptr)) == sizeof(Yes);
};
} // end namespace ilist_detail
@ -290,8 +287,14 @@ template <typename NodeTy, typename Traits = ilist_traits<NodeTy>>
class iplist : public Traits, ilist_node_access {
// TODO: Drop these assertions anytime after 4.0 is branched (keep them for
// one release to help out-of-tree code update).
static_assert(!ilist_detail::HasObsoleteCustomization<Traits, NodeTy>::value,
"ilist customization points have changed!");
#if !defined(_MSC_VER)
// FIXME: This fails in MSVC, but it's worth keeping around to help
// non-Windows users root out bugs in their ilist_traits.
static_assert(!ilist_detail::HasGetNext<Traits, NodeTy>::value,
"ilist next and prev links are not customizable!");
static_assert(!ilist_detail::HasCreateSentinel<Traits>::value,
"ilist sentinel is not customizable!");
#endif
ilist_sentinel<NodeTy> Sentinel;

17
unittests/ADT/ilistTest.cpp
View File

@ -190,21 +190,4 @@ TEST(ilistTest, privateNode) {
L2.remove(&N);
}
struct GetNext {
Node *getNext(Node *);
};
TEST(ilistTest, HasGetNextTrait) {
EXPECT_TRUE((ilist_detail::HasGetNext<GetNext, Node>::value));
EXPECT_TRUE((ilist_detail::HasObsoleteCustomization<GetNext, Node>::value));
}
struct CreateSentinel {
Node *createSentinel();
};
TEST(ilistTest, HasCreateSentinel) {
EXPECT_TRUE((ilist_detail::HasCreateSentinel<CreateSentinel>::value));
EXPECT_TRUE(
(ilist_detail::HasObsoleteCustomization<CreateSentinel, Node>::value));
}
} // end namespace