RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix PointerIntPair so that it can use an enum class as its integer template argument.

Browse Source 
Summary:
The problem here is that an enum class can not be implicitly converted to an
integer. That assumption snuck back into PointerIntPair. This commit fixes the
issue and more importantly adds some unittests to make sure that we do not break
this again.

rdar://23594806

Reviewers: gribozavr

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D16131

llvm-svn: 257574
This commit is contained in:
Michael Gottesman 2016-01-13 05:59:13 +00:00
parent 78927c1cdb
commit b04f462e22
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/ADT/PointerIntPair.h
View File

@ -55,20 +55,25 @@ public:
PointerTy getPointer() const { return Info::getPointer(Value); }
IntType getInt() const { return (IntType)Info::getInt(Value); }
IntType getInt() const {
return (IntType)Info::getInt(Value);
}
void setPointer(PointerTy PtrVal) {
Value = Info::updatePointer(Value, PtrVal);
}
void setInt(IntType IntVal) { Value = Info::updateInt(Value, IntVal); }
void setInt(IntType IntVal) {
Value = Info::updateInt(Value, static_cast<intptr_t>(IntVal));
}
void initWithPointer(PointerTy PtrVal) {
Value = Info::updatePointer(0, PtrVal);
}
void setPointerAndInt(PointerTy PtrVal, IntType IntVal) {
Value = Info::updateInt(Info::updatePointer(0, PtrVal), IntVal);
Value = Info::updateInt(Info::updatePointer(0, PtrVal),
static_cast<intptr_t>(IntVal));
}
PointerTy const *getAddrOfPointer() const {

27
unittests/ADT/PointerIntPairTest.cpp
View File

@ -35,6 +35,33 @@ TEST(PointerIntPairTest, GetSet) {
Pair.setPointerAndInt(&s, 3U);
EXPECT_EQ(&s, Pair.getPointer());
EXPECT_EQ(3U, Pair.getInt());
// Make sure that we can perform all of our operations on enum classes.
//
// The concern is that enum classes are only explicitly convertible to
// integers. This means that if we assume in PointerIntPair this, a
// compilation error will result. This group of tests exercises the enum class
// code to make sure that we do not run into such issues in the future.
enum class E : unsigned {
Case1,
Case2,
Case3,
};
PointerIntPair<S *, 2, E> Pair2(&s, E::Case1);
EXPECT_EQ(&s, Pair2.getPointer());
EXPECT_EQ(E::Case1, Pair2.getInt());
Pair2.setInt(E::Case2);
EXPECT_EQ(&s, Pair2.getPointer());
EXPECT_EQ(E::Case2, Pair2.getInt());
Pair2.setPointer(nullptr);
EXPECT_EQ(nullptr, Pair2.getPointer());
EXPECT_EQ(E::Case2, Pair2.getInt());
Pair2.setPointerAndInt(&s, E::Case3);
EXPECT_EQ(&s, Pair2.getPointer());
EXPECT_EQ(E::Case3, Pair2.getInt());
}
TEST(PointerIntPairTest, DefaultInitialize) {