6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-11 08:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Revert 119600 to unbreak the build. Francois, please investigate.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119606 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Grosbach 2010-11-18 01:38:07 +00:00
parent b4ac2858da
commit e541528e35
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unittests/VMCore/ValueMapTest.cpp
View File

@ -72,29 +72,29 @@ TYPED_TEST(ValueMapTest, OperationsWork) {
typename ValueMap<TypeParam*, int>::iterator I = typename ValueMap<TypeParam*, int>::iterator I =
VM.find(this->BitcastV.get()); VM.find(this->BitcastV.get());
ASSERT_TRUE(I != VM.end()); ASSERT_TRUE(I != VM.end());
EXPECT_EQ(BitcastV.get(), I->first); EXPECT_EQ(this->BitcastV.get(), I->first);
EXPECT_EQ(7, I->second); EXPECT_EQ(7, I->second);
EXPECT_TRUE(VM.find(AddV.get()) == VM.end()); EXPECT_TRUE(VM.find(this->AddV.get()) == VM.end());
// Const find: // Const find:
const ValueMap<TypeParam*, int> &CVM = VM; const ValueMap<TypeParam*, int> &CVM = VM;
typename ValueMap<TypeParam*, int>::const_iterator CI = typename ValueMap<TypeParam*, int>::const_iterator CI =
CVM.find(this->BitcastV.get()); CVM.find(this->BitcastV.get());
ASSERT_TRUE(CI != CVM.end()); ASSERT_TRUE(CI != CVM.end());
EXPECT_EQ(BitcastV.get(), CI->first); EXPECT_EQ(this->BitcastV.get(), CI->first);
EXPECT_EQ(7, CI->second); EXPECT_EQ(7, CI->second);
EXPECT_TRUE(CVM.find(this->AddV.get()) == CVM.end()); EXPECT_TRUE(CVM.find(this->AddV.get()) == CVM.end());
// Insert: // Insert:
std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult1 = std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult1 =
VM.insert(std::make_pair(this->AddV.get(), 3)); VM.insert(std::make_pair(this->AddV.get(), 3));
EXPECT_EQ(/*->this*/AddV.get(), InsertResult1.first->first); EXPECT_EQ(this->AddV.get(), InsertResult1.first->first);
EXPECT_EQ(3, InsertResult1.first->second); EXPECT_EQ(3, InsertResult1.first->second);
EXPECT_TRUE(InsertResult1.second); EXPECT_TRUE(InsertResult1.second);
EXPECT_EQ(true, VM.count(this->AddV.get())); EXPECT_EQ(true, VM.count(this->AddV.get()));
std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult2 = std::pair<typename ValueMap<TypeParam*, int>::iterator, bool> InsertResult2 =
VM.insert(std::make_pair(this->AddV.get(), 5)); VM.insert(std::make_pair(this->AddV.get(), 5));
EXPECT_EQ(/*this->*/AddV.get(), InsertResult2.first->first); EXPECT_EQ(this->AddV.get(), InsertResult2.first->first);
EXPECT_EQ(3, InsertResult2.first->second); EXPECT_EQ(3, InsertResult2.first->second);
EXPECT_FALSE(InsertResult2.second); EXPECT_FALSE(InsertResult2.second);
@ -131,10 +131,10 @@ TYPED_TEST(ValueMapTest, Iteration) {
std::pair<TypeParam*, int> value = *I; (void)value; std::pair<TypeParam*, int> value = *I; (void)value;
CompileAssertHasType<TypeParam*>(I->first); CompileAssertHasType<TypeParam*>(I->first);
if (I->second == 2) { if (I->second == 2) {
EXPECT_EQ(/*this->*/BitcastV.get(), I->first); EXPECT_EQ(this->BitcastV.get(), I->first);
I->second = 5; I->second = 5;
} else if (I->second == 3) { } else if (I->second == 3) {
EXPECT_EQ(/*this->*/AddV.get(), I->first); EXPECT_EQ(this->AddV.get(), I->first);
I->second = 6; I->second = 6;
} else { } else {
ADD_FAILURE() << "Iterated through an extra value."; ADD_FAILURE() << "Iterated through an extra value.";
@ -153,9 +153,9 @@ TYPED_TEST(ValueMapTest, Iteration) {
std::pair<TypeParam*, int> value = *I; (void)value; std::pair<TypeParam*, int> value = *I; (void)value;
CompileAssertHasType<TypeParam*>(I->first); CompileAssertHasType<TypeParam*>(I->first);
if (I->second == 5) { if (I->second == 5) {
EXPECT_EQ(/*this->*/BitcastV.get(), I->first); EXPECT_EQ(this->BitcastV.get(), I->first);
} else if (I->second == 6) { } else if (I->second == 6) {
EXPECT_EQ(/*this->*/AddV.get(), I->first); EXPECT_EQ(this->AddV.get(), I->first);
} else { } else {
ADD_FAILURE() << "Iterated through an extra value."; ADD_FAILURE() << "Iterated through an extra value.";
} }