RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-07 10:42:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

unittests: Remove implicit ilist iterator conversions, NFC

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250843 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith 2015-10-20 18:30:20 +00:00
parent 00f8d5fdf7
commit 70f8c2049f
10 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unittests/ADT/ilistTest.cpp
View File

@ -81,7 +81,7 @@ TEST(ilistTest, UnsafeClear) {
// List with contents. // List with contents.
List.push_back(1); List.push_back(1);
ASSERT_EQ(1u, List.size()); ASSERT_EQ(1u, List.size());
Node *N = List.begin(); Node *N = &*List.begin();
EXPECT_EQ(1, N->Value); EXPECT_EQ(1, N->Value);
List.clearAndLeakNodesUnsafely(); List.clearAndLeakNodesUnsafely();
EXPECT_EQ(0u, List.size()); EXPECT_EQ(0u, List.size());

2
unittests/Analysis/CFGTest.cpp
View File

@ -378,7 +378,7 @@ TEST_F(IsPotentiallyReachableTest, BranchInsideLoop) {
TEST_F(IsPotentiallyReachableTest, ModifyTest) { TEST_F(IsPotentiallyReachableTest, ModifyTest) {
ParseAssembly(BranchInsideLoopIR); ParseAssembly(BranchInsideLoopIR);
succ_iterator S = succ_begin(++M->getFunction("test")->begin()); succ_iterator S = succ_begin(&*++M->getFunction("test")->begin());
BasicBlock *OldBB = S[0]; BasicBlock *OldBB = S[0];
S[0] = S[1]; S[0] = S[1];
ExpectPath(false); ExpectPath(false);

11
unittests/ExecutionEngine/MCJIT/MCJITTestBase.h
View File

@ -69,9 +69,8 @@ protected:
SmallVector<Value*, 1> CallArgs; SmallVector<Value*, 1> CallArgs;
Function::arg_iterator arg_iter = Result->arg_begin(); for (Argument &A : Result->args())
for(;arg_iter != Result->arg_end(); ++arg_iter) CallArgs.push_back(&A);
CallArgs.push_back(arg_iter);
Value *ReturnCode = Builder.CreateCall(Callee, CallArgs); Value *ReturnCode = Builder.CreateCall(Callee, CallArgs);
Builder.CreateRet(ReturnCode); Builder.CreateRet(ReturnCode);
@ -97,8 +96,8 @@ protected:
Function *Result = startFunction<int32_t(int32_t, int32_t)>(M, Name); Function *Result = startFunction<int32_t(int32_t, int32_t)>(M, Name);
Function::arg_iterator args = Result->arg_begin(); Function::arg_iterator args = Result->arg_begin();
Value *Arg1 = args; Value *Arg1 = &*args;
Value *Arg2 = ++args; Value *Arg2 = &*++args;
Value *AddResult = Builder.CreateAdd(Arg1, Arg2); Value *AddResult = Builder.CreateAdd(Arg1, Arg2);
endFunctionWithRet(Result, AddResult); endFunctionWithRet(Result, AddResult);
@ -169,7 +168,7 @@ protected:
BasicBlock *RecursiveCase = BasicBlock::Create(Context, "", Result); BasicBlock *RecursiveCase = BasicBlock::Create(Context, "", Result);
// if (num == 0) // if (num == 0)
Value *Param = Result->arg_begin(); Value *Param = &*Result->arg_begin();
Value *Zero = ConstantInt::get(Context, APInt(32, 0)); Value *Zero = ConstantInt::get(Context, APInt(32, 0));
Builder.CreateCondBr(Builder.CreateICmpEQ(Param, Zero), Builder.CreateCondBr(Builder.CreateICmpEQ(Param, Zero),
BaseCase, RecursiveCase); BaseCase, RecursiveCase);

28
unittests/IR/DominatorTreeTest.cpp
View File

@ -32,29 +32,29 @@ namespace llvm {
PostDominatorTree *PDT = &getAnalysis<PostDominatorTree>(); PostDominatorTree *PDT = &getAnalysis<PostDominatorTree>();
Function::iterator FI = F.begin(); Function::iterator FI = F.begin();
BasicBlock *BB0 = FI++; BasicBlock *BB0 = &*FI++;
BasicBlock::iterator BBI = BB0->begin(); BasicBlock::iterator BBI = BB0->begin();
Instruction *Y1 = BBI++; Instruction *Y1 = &*BBI++;
Instruction *Y2 = BBI++; Instruction *Y2 = &*BBI++;
Instruction *Y3 = BBI++; Instruction *Y3 = &*BBI++;
BasicBlock *BB1 = FI++; BasicBlock *BB1 = &*FI++;
BBI = BB1->begin(); BBI = BB1->begin();
Instruction *Y4 = BBI++; Instruction *Y4 = &*BBI++;
BasicBlock *BB2 = FI++; BasicBlock *BB2 = &*FI++;
BBI = BB2->begin(); BBI = BB2->begin();
Instruction *Y5 = BBI++; Instruction *Y5 = &*BBI++;
BasicBlock *BB3 = FI++; BasicBlock *BB3 = &*FI++;
BBI = BB3->begin(); BBI = BB3->begin();
Instruction *Y6 = BBI++; Instruction *Y6 = &*BBI++;
Instruction *Y7 = BBI++; Instruction *Y7 = &*BBI++;
BasicBlock *BB4 = FI++; BasicBlock *BB4 = &*FI++;
BBI = BB4->begin(); BBI = BB4->begin();
Instruction *Y8 = BBI++; Instruction *Y8 = &*BBI++;
Instruction *Y9 = BBI++; Instruction *Y9 = &*BBI++;
// Reachability // Reachability
EXPECT_TRUE(DT->isReachableFromEntry(BB0)); EXPECT_TRUE(DT->isReachableFromEntry(BB0));

4
unittests/IR/IRBuilderTest.cpp
View File

@ -299,7 +299,7 @@ TEST_F(IRBuilderTest, RAIIHelpersTest) {
{ {
IRBuilder<>::InsertPointGuard Guard(Builder); IRBuilder<>::InsertPointGuard Guard(Builder);
Builder.SetInsertPoint(cast<Instruction>(F)); Builder.SetInsertPoint(cast<Instruction>(F));
EXPECT_EQ(F, Builder.GetInsertPoint()); EXPECT_EQ(F, &*Builder.GetInsertPoint());
} }
EXPECT_EQ(BB->end(), Builder.GetInsertPoint()); EXPECT_EQ(BB->end(), Builder.GetInsertPoint());
@ -379,7 +379,7 @@ TEST_F(IRBuilderTest, DebugLoc) {
EXPECT_EQ(DL1, Call1->getDebugLoc()); EXPECT_EQ(DL1, Call1->getDebugLoc());
Call1->setDebugLoc(DL2); Call1->setDebugLoc(DL2);
Builder.SetInsertPoint(Call1->getParent(), Call1); Builder.SetInsertPoint(Call1->getParent(), Call1->getIterator());
EXPECT_EQ(DL2, Builder.getCurrentDebugLocation()); EXPECT_EQ(DL2, Builder.getCurrentDebugLocation());
auto Call2 = Builder.CreateCall(Callee, None); auto Call2 = Builder.CreateCall(Callee, None);
EXPECT_EQ(DL2, Call2->getDebugLoc()); EXPECT_EQ(DL2, Call2->getDebugLoc());

2
unittests/IR/LegacyPassManagerTest.cpp
View File

@ -510,7 +510,7 @@ namespace llvm {
// Function: test4 (func_test4) // Function: test4 (func_test4)
{ {
Function::arg_iterator args = func_test4->arg_begin(); Function::arg_iterator args = func_test4->arg_begin();
Value* int1_f = args++; Value *int1_f = &*args++;
int1_f->setName("f"); int1_f->setName("f");
BasicBlock* label_entry_11 = BasicBlock::Create(getGlobalContext(), "entry",func_test4,nullptr); BasicBlock* label_entry_11 = BasicBlock::Create(getGlobalContext(), "entry",func_test4,nullptr);

18
unittests/IR/ValueTest.cpp
View File

@ -39,9 +39,9 @@ TEST(ValueTest, UsedInBasicBlock) {
Function *F = M->getFunction("f"); Function *F = M->getFunction("f");
EXPECT_FALSE(F->isUsedInBasicBlock(F->begin())); EXPECT_FALSE(F->isUsedInBasicBlock(&F->front()));
EXPECT_TRUE((++F->arg_begin())->isUsedInBasicBlock(F->begin())); EXPECT_TRUE((++F->arg_begin())->isUsedInBasicBlock(&F->front()));
EXPECT_TRUE(F->arg_begin()->isUsedInBasicBlock(F->begin())); EXPECT_TRUE(F->arg_begin()->isUsedInBasicBlock(&F->front()));
} }
TEST(GlobalTest, CreateAddressSpace) { TEST(GlobalTest, CreateAddressSpace) {
@ -127,9 +127,9 @@ TEST(ValueTest, printSlots) {
BasicBlock &BB = F->getEntryBlock(); BasicBlock &BB = F->getEntryBlock();
ASSERT_EQ(3u, BB.size()); ASSERT_EQ(3u, BB.size());
Instruction *I0 = BB.begin(); Instruction *I0 = &*BB.begin();
ASSERT_TRUE(I0); ASSERT_TRUE(I0);
Instruction *I1 = ++BB.begin(); Instruction *I1 = &*++BB.begin();
ASSERT_TRUE(I1); ASSERT_TRUE(I1);
ModuleSlotTracker MST(M.get()); ModuleSlotTracker MST(M.get());
@ -194,12 +194,12 @@ TEST(ValueTest, getLocalSlots) {
ASSERT_FALSE(F->empty()); ASSERT_FALSE(F->empty());
BasicBlock &EntryBB = F->getEntryBlock(); BasicBlock &EntryBB = F->getEntryBlock();
ASSERT_EQ(3u, EntryBB.size()); ASSERT_EQ(3u, EntryBB.size());
BasicBlock *BB2 = ++F->begin(); BasicBlock *BB2 = &*++F->begin();
ASSERT_TRUE(BB2); ASSERT_TRUE(BB2);
Instruction *I0 = EntryBB.begin(); Instruction *I0 = &*EntryBB.begin();
ASSERT_TRUE(I0); ASSERT_TRUE(I0);
Instruction *I1 = ++EntryBB.begin(); Instruction *I1 = &*++EntryBB.begin();
ASSERT_TRUE(I1); ASSERT_TRUE(I1);
ModuleSlotTracker MST(M.get()); ModuleSlotTracker MST(M.get());
@ -227,7 +227,7 @@ TEST(ValueTest, getLocalSlotDeath) {
Function *F = M->getFunction("f"); Function *F = M->getFunction("f");
ASSERT_TRUE(F); ASSERT_TRUE(F);
ASSERT_FALSE(F->empty()); ASSERT_FALSE(F->empty());
BasicBlock *BB2 = ++F->begin(); BasicBlock *BB2 = &*++F->begin();
ASSERT_TRUE(BB2); ASSERT_TRUE(BB2);
ModuleSlotTracker MST(M.get()); ModuleSlotTracker MST(M.get());

2
unittests/Linker/LinkModulesTest.cpp
View File

@ -76,7 +76,7 @@ TEST_F(LinkModuleTest, BlockAddress) {
std::vector<Value *> GEPIndices; std::vector<Value *> GEPIndices;
GEPIndices.push_back(ConstantInt::get(Type::getInt32Ty(Ctx), 0)); GEPIndices.push_back(ConstantInt::get(Type::getInt32Ty(Ctx), 0));
GEPIndices.push_back(F->arg_begin()); GEPIndices.push_back(&*F->arg_begin());
Value *GEP = Builder.CreateGEP(AT, GV, GEPIndices, "switch.gep"); Value *GEP = Builder.CreateGEP(AT, GV, GEPIndices, "switch.gep");
Value *Load = Builder.CreateLoad(GEP, "switch.load"); Value *Load = Builder.CreateLoad(GEP, "switch.load");

4
unittests/Transforms/Utils/Cloning.cpp
View File

@ -165,7 +165,7 @@ TEST_F(CloneInstruction, Attributes) {
Attribute::AttrKind AK[] = { Attribute::NoCapture }; Attribute::AttrKind AK[] = { Attribute::NoCapture };
AttributeSet AS = AttributeSet::get(context, 0, AK); AttributeSet AS = AttributeSet::get(context, 0, AK);
Argument *A = F1->arg_begin(); Argument *A = &*F1->arg_begin();
A->addAttr(AS); A->addAttr(AS);
SmallVector<ReturnInst*, 4> Returns; SmallVector<ReturnInst*, 4> Returns;
@ -193,7 +193,7 @@ TEST_F(CloneInstruction, CallingConvention) {
SmallVector<ReturnInst*, 4> Returns; SmallVector<ReturnInst*, 4> Returns;
ValueToValueMapTy VMap; ValueToValueMapTy VMap;
VMap[F1->arg_begin()] = F2->arg_begin(); VMap[&*F1->arg_begin()] = &*F2->arg_begin();
CloneFunctionInto(F2, F1, VMap, false, Returns); CloneFunctionInto(F2, F1, VMap, false, Returns);
EXPECT_EQ(CallingConv::Cold, F2->getCallingConv()); EXPECT_EQ(CallingConv::Cold, F2->getCallingConv());

32
unittests/Transforms/Utils/IntegerDivision.cpp
View File

@ -35,8 +35,8 @@ TEST(IntegerDivision, SDiv) {
Builder.SetInsertPoint(BB); Builder.SetInsertPoint(BB);
Function::arg_iterator AI = F->arg_begin(); Function::arg_iterator AI = F->arg_begin();
Value *A = AI++; Value *A = &*AI++;
Value *B = AI++; Value *B = &*AI++;
Value *Div = Builder.CreateSDiv(A, B); Value *Div = Builder.CreateSDiv(A, B);
EXPECT_TRUE(BB->front().getOpcode() == Instruction::SDiv); EXPECT_TRUE(BB->front().getOpcode() == Instruction::SDiv);
@ -65,8 +65,8 @@ TEST(IntegerDivision, UDiv) {
Builder.SetInsertPoint(BB); Builder.SetInsertPoint(BB);
Function::arg_iterator AI = F->arg_begin(); Function::arg_iterator AI = F->arg_begin();
Value *A = AI++; Value *A = &*AI++;
Value *B = AI++; Value *B = &*AI++;
Value *Div = Builder.CreateUDiv(A, B); Value *Div = Builder.CreateUDiv(A, B);
EXPECT_TRUE(BB->front().getOpcode() == Instruction::UDiv); EXPECT_TRUE(BB->front().getOpcode() == Instruction::UDiv);
@ -95,8 +95,8 @@ TEST(IntegerDivision, SRem) {
Builder.SetInsertPoint(BB); Builder.SetInsertPoint(BB);
Function::arg_iterator AI = F->arg_begin(); Function::arg_iterator AI = F->arg_begin();
Value *A = AI++; Value *A = &*AI++;
Value *B = AI++; Value *B = &*AI++;
Value *Rem = Builder.CreateSRem(A, B); Value *Rem = Builder.CreateSRem(A, B);
EXPECT_TRUE(BB->front().getOpcode() == Instruction::SRem); EXPECT_TRUE(BB->front().getOpcode() == Instruction::SRem);
@ -125,8 +125,8 @@ TEST(IntegerDivision, URem) {
Builder.SetInsertPoint(BB); Builder.SetInsertPoint(BB);
Function::arg_iterator AI = F->arg_begin(); Function::arg_iterator AI = F->arg_begin();
Value *A = AI++; Value *A = &*AI++;
Value *B = AI++; Value *B = &*AI++;
Value *Rem = Builder.CreateURem(A, B); Value *Rem = Builder.CreateURem(A, B);
EXPECT_TRUE(BB->front().getOpcode() == Instruction::URem); EXPECT_TRUE(BB->front().getOpcode() == Instruction::URem);
@ -156,8 +156,8 @@ TEST(IntegerDivision, SDiv64) {
Builder.SetInsertPoint(BB); Builder.SetInsertPoint(BB);
Function::arg_iterator AI = F->arg_begin(); Function::arg_iterator AI = F->arg_begin();
Value *A = AI++; Value *A = &*AI++;
Value *B = AI++; Value *B = &*AI++;
Value *Div = Builder.CreateSDiv(A, B); Value *Div = Builder.CreateSDiv(A, B);
EXPECT_TRUE(BB->front().getOpcode() == Instruction::SDiv); EXPECT_TRUE(BB->front().getOpcode() == Instruction::SDiv);
@ -186,8 +186,8 @@ TEST(IntegerDivision, UDiv64) {
Builder.SetInsertPoint(BB); Builder.SetInsertPoint(BB);
Function::arg_iterator AI = F->arg_begin(); Function::arg_iterator AI = F->arg_begin();
Value *A = AI++; Value *A = &*AI++;
Value *B = AI++; Value *B = &*AI++;
Value *Div = Builder.CreateUDiv(A, B); Value *Div = Builder.CreateUDiv(A, B);
EXPECT_TRUE(BB->front().getOpcode() == Instruction::UDiv); EXPECT_TRUE(BB->front().getOpcode() == Instruction::UDiv);
@ -216,8 +216,8 @@ TEST(IntegerDivision, SRem64) {
Builder.SetInsertPoint(BB); Builder.SetInsertPoint(BB);
Function::arg_iterator AI = F->arg_begin(); Function::arg_iterator AI = F->arg_begin();
Value *A = AI++; Value *A = &*AI++;
Value *B = AI++; Value *B = &*AI++;
Value *Rem = Builder.CreateSRem(A, B); Value *Rem = Builder.CreateSRem(A, B);
EXPECT_TRUE(BB->front().getOpcode() == Instruction::SRem); EXPECT_TRUE(BB->front().getOpcode() == Instruction::SRem);
@ -246,8 +246,8 @@ TEST(IntegerDivision, URem64) {
Builder.SetInsertPoint(BB); Builder.SetInsertPoint(BB);
Function::arg_iterator AI = F->arg_begin(); Function::arg_iterator AI = F->arg_begin();
Value *A = AI++; Value *A = &*AI++;
Value *B = AI++; Value *B = &*AI++;
Value *Rem = Builder.CreateURem(A, B); Value *Rem = Builder.CreateURem(A, B);
EXPECT_TRUE(BB->front().getOpcode() == Instruction::URem); EXPECT_TRUE(BB->front().getOpcode() == Instruction::URem);