From 70f8c2049fceeebb3342dfedfd5aceba6fa356d9 Mon Sep 17 00:00:00 2001 From: "Duncan P. N. Exon Smith" Date: Tue, 20 Oct 2015 18:30:20 +0000 Subject: [PATCH] unittests: Remove implicit ilist iterator conversions, NFC git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@250843 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/ADT/ilistTest.cpp | 2 +- unittests/Analysis/CFGTest.cpp | 2 +- .../ExecutionEngine/MCJIT/MCJITTestBase.h | 11 +++---- unittests/IR/DominatorTreeTest.cpp | 28 ++++++++-------- unittests/IR/IRBuilderTest.cpp | 4 +-- unittests/IR/LegacyPassManagerTest.cpp | 2 +- unittests/IR/ValueTest.cpp | 18 +++++------ unittests/Linker/LinkModulesTest.cpp | 2 +- unittests/Transforms/Utils/Cloning.cpp | 4 +-- .../Transforms/Utils/IntegerDivision.cpp | 32 +++++++++---------- 10 files changed, 52 insertions(+), 53 deletions(-) diff --git a/unittests/ADT/ilistTest.cpp b/unittests/ADT/ilistTest.cpp index 9127b05b4b8..4e5235ba03b 100644 --- a/unittests/ADT/ilistTest.cpp +++ b/unittests/ADT/ilistTest.cpp @@ -81,7 +81,7 @@ TEST(ilistTest, UnsafeClear) { // List with contents. List.push_back(1); ASSERT_EQ(1u, List.size()); - Node *N = List.begin(); + Node *N = &*List.begin(); EXPECT_EQ(1, N->Value); List.clearAndLeakNodesUnsafely(); EXPECT_EQ(0u, List.size()); diff --git a/unittests/Analysis/CFGTest.cpp b/unittests/Analysis/CFGTest.cpp index b29c168ce08..44f0fe681df 100644 --- a/unittests/Analysis/CFGTest.cpp +++ b/unittests/Analysis/CFGTest.cpp @@ -378,7 +378,7 @@ TEST_F(IsPotentiallyReachableTest, BranchInsideLoop) { TEST_F(IsPotentiallyReachableTest, ModifyTest) { ParseAssembly(BranchInsideLoopIR); - succ_iterator S = succ_begin(++M->getFunction("test")->begin()); + succ_iterator S = succ_begin(&*++M->getFunction("test")->begin()); BasicBlock *OldBB = S[0]; S[0] = S[1]; ExpectPath(false); diff --git a/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h b/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h index d2e62d2cea2..609ac844c47 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h +++ b/unittests/ExecutionEngine/MCJIT/MCJITTestBase.h @@ -69,9 +69,8 @@ protected: SmallVector CallArgs; - Function::arg_iterator arg_iter = Result->arg_begin(); - for(;arg_iter != Result->arg_end(); ++arg_iter) - CallArgs.push_back(arg_iter); + for (Argument &A : Result->args()) + CallArgs.push_back(&A); Value *ReturnCode = Builder.CreateCall(Callee, CallArgs); Builder.CreateRet(ReturnCode); @@ -97,8 +96,8 @@ protected: Function *Result = startFunction(M, Name); Function::arg_iterator args = Result->arg_begin(); - Value *Arg1 = args; - Value *Arg2 = ++args; + Value *Arg1 = &*args; + Value *Arg2 = &*++args; Value *AddResult = Builder.CreateAdd(Arg1, Arg2); endFunctionWithRet(Result, AddResult); @@ -169,7 +168,7 @@ protected: BasicBlock *RecursiveCase = BasicBlock::Create(Context, "", Result); // if (num == 0) - Value *Param = Result->arg_begin(); + Value *Param = &*Result->arg_begin(); Value *Zero = ConstantInt::get(Context, APInt(32, 0)); Builder.CreateCondBr(Builder.CreateICmpEQ(Param, Zero), BaseCase, RecursiveCase); diff --git a/unittests/IR/DominatorTreeTest.cpp b/unittests/IR/DominatorTreeTest.cpp index 146ec576dba..3aef4d64cbc 100644 --- a/unittests/IR/DominatorTreeTest.cpp +++ b/unittests/IR/DominatorTreeTest.cpp @@ -32,29 +32,29 @@ namespace llvm { PostDominatorTree *PDT = &getAnalysis(); Function::iterator FI = F.begin(); - BasicBlock *BB0 = FI++; + BasicBlock *BB0 = &*FI++; BasicBlock::iterator BBI = BB0->begin(); - Instruction *Y1 = BBI++; - Instruction *Y2 = BBI++; - Instruction *Y3 = BBI++; + Instruction *Y1 = &*BBI++; + Instruction *Y2 = &*BBI++; + Instruction *Y3 = &*BBI++; - BasicBlock *BB1 = FI++; + BasicBlock *BB1 = &*FI++; BBI = BB1->begin(); - Instruction *Y4 = BBI++; + Instruction *Y4 = &*BBI++; - BasicBlock *BB2 = FI++; + BasicBlock *BB2 = &*FI++; BBI = BB2->begin(); - Instruction *Y5 = BBI++; + Instruction *Y5 = &*BBI++; - BasicBlock *BB3 = FI++; + BasicBlock *BB3 = &*FI++; BBI = BB3->begin(); - Instruction *Y6 = BBI++; - Instruction *Y7 = BBI++; + Instruction *Y6 = &*BBI++; + Instruction *Y7 = &*BBI++; - BasicBlock *BB4 = FI++; + BasicBlock *BB4 = &*FI++; BBI = BB4->begin(); - Instruction *Y8 = BBI++; - Instruction *Y9 = BBI++; + Instruction *Y8 = &*BBI++; + Instruction *Y9 = &*BBI++; // Reachability EXPECT_TRUE(DT->isReachableFromEntry(BB0)); diff --git a/unittests/IR/IRBuilderTest.cpp b/unittests/IR/IRBuilderTest.cpp index 30e137cadbc..5f3aac05b11 100644 --- a/unittests/IR/IRBuilderTest.cpp +++ b/unittests/IR/IRBuilderTest.cpp @@ -299,7 +299,7 @@ TEST_F(IRBuilderTest, RAIIHelpersTest) { { IRBuilder<>::InsertPointGuard Guard(Builder); Builder.SetInsertPoint(cast(F)); - EXPECT_EQ(F, Builder.GetInsertPoint()); + EXPECT_EQ(F, &*Builder.GetInsertPoint()); } EXPECT_EQ(BB->end(), Builder.GetInsertPoint()); @@ -379,7 +379,7 @@ TEST_F(IRBuilderTest, DebugLoc) { EXPECT_EQ(DL1, Call1->getDebugLoc()); Call1->setDebugLoc(DL2); - Builder.SetInsertPoint(Call1->getParent(), Call1); + Builder.SetInsertPoint(Call1->getParent(), Call1->getIterator()); EXPECT_EQ(DL2, Builder.getCurrentDebugLocation()); auto Call2 = Builder.CreateCall(Callee, None); EXPECT_EQ(DL2, Call2->getDebugLoc()); diff --git a/unittests/IR/LegacyPassManagerTest.cpp b/unittests/IR/LegacyPassManagerTest.cpp index 66fd1ccd7f2..1f88283dc0c 100644 --- a/unittests/IR/LegacyPassManagerTest.cpp +++ b/unittests/IR/LegacyPassManagerTest.cpp @@ -510,7 +510,7 @@ namespace llvm { // Function: test4 (func_test4) { Function::arg_iterator args = func_test4->arg_begin(); - Value* int1_f = args++; + Value *int1_f = &*args++; int1_f->setName("f"); BasicBlock* label_entry_11 = BasicBlock::Create(getGlobalContext(), "entry",func_test4,nullptr); diff --git a/unittests/IR/ValueTest.cpp b/unittests/IR/ValueTest.cpp index 7a4c2f696f7..9cf1306dae6 100644 --- a/unittests/IR/ValueTest.cpp +++ b/unittests/IR/ValueTest.cpp @@ -39,9 +39,9 @@ TEST(ValueTest, UsedInBasicBlock) { Function *F = M->getFunction("f"); - EXPECT_FALSE(F->isUsedInBasicBlock(F->begin())); - EXPECT_TRUE((++F->arg_begin())->isUsedInBasicBlock(F->begin())); - EXPECT_TRUE(F->arg_begin()->isUsedInBasicBlock(F->begin())); + EXPECT_FALSE(F->isUsedInBasicBlock(&F->front())); + EXPECT_TRUE((++F->arg_begin())->isUsedInBasicBlock(&F->front())); + EXPECT_TRUE(F->arg_begin()->isUsedInBasicBlock(&F->front())); } TEST(GlobalTest, CreateAddressSpace) { @@ -127,9 +127,9 @@ TEST(ValueTest, printSlots) { BasicBlock &BB = F->getEntryBlock(); ASSERT_EQ(3u, BB.size()); - Instruction *I0 = BB.begin(); + Instruction *I0 = &*BB.begin(); ASSERT_TRUE(I0); - Instruction *I1 = ++BB.begin(); + Instruction *I1 = &*++BB.begin(); ASSERT_TRUE(I1); ModuleSlotTracker MST(M.get()); @@ -194,12 +194,12 @@ TEST(ValueTest, getLocalSlots) { ASSERT_FALSE(F->empty()); BasicBlock &EntryBB = F->getEntryBlock(); ASSERT_EQ(3u, EntryBB.size()); - BasicBlock *BB2 = ++F->begin(); + BasicBlock *BB2 = &*++F->begin(); ASSERT_TRUE(BB2); - Instruction *I0 = EntryBB.begin(); + Instruction *I0 = &*EntryBB.begin(); ASSERT_TRUE(I0); - Instruction *I1 = ++EntryBB.begin(); + Instruction *I1 = &*++EntryBB.begin(); ASSERT_TRUE(I1); ModuleSlotTracker MST(M.get()); @@ -227,7 +227,7 @@ TEST(ValueTest, getLocalSlotDeath) { Function *F = M->getFunction("f"); ASSERT_TRUE(F); ASSERT_FALSE(F->empty()); - BasicBlock *BB2 = ++F->begin(); + BasicBlock *BB2 = &*++F->begin(); ASSERT_TRUE(BB2); ModuleSlotTracker MST(M.get()); diff --git a/unittests/Linker/LinkModulesTest.cpp b/unittests/Linker/LinkModulesTest.cpp index 904ba58ce48..a1d889a6b3d 100644 --- a/unittests/Linker/LinkModulesTest.cpp +++ b/unittests/Linker/LinkModulesTest.cpp @@ -76,7 +76,7 @@ TEST_F(LinkModuleTest, BlockAddress) { std::vector GEPIndices; 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 *Load = Builder.CreateLoad(GEP, "switch.load"); diff --git a/unittests/Transforms/Utils/Cloning.cpp b/unittests/Transforms/Utils/Cloning.cpp index 62a280df812..ab782ada292 100644 --- a/unittests/Transforms/Utils/Cloning.cpp +++ b/unittests/Transforms/Utils/Cloning.cpp @@ -165,7 +165,7 @@ TEST_F(CloneInstruction, Attributes) { Attribute::AttrKind AK[] = { Attribute::NoCapture }; AttributeSet AS = AttributeSet::get(context, 0, AK); - Argument *A = F1->arg_begin(); + Argument *A = &*F1->arg_begin(); A->addAttr(AS); SmallVector Returns; @@ -193,7 +193,7 @@ TEST_F(CloneInstruction, CallingConvention) { SmallVector Returns; ValueToValueMapTy VMap; - VMap[F1->arg_begin()] = F2->arg_begin(); + VMap[&*F1->arg_begin()] = &*F2->arg_begin(); CloneFunctionInto(F2, F1, VMap, false, Returns); EXPECT_EQ(CallingConv::Cold, F2->getCallingConv()); diff --git a/unittests/Transforms/Utils/IntegerDivision.cpp b/unittests/Transforms/Utils/IntegerDivision.cpp index f7318a2e789..4cda2b4e589 100644 --- a/unittests/Transforms/Utils/IntegerDivision.cpp +++ b/unittests/Transforms/Utils/IntegerDivision.cpp @@ -35,8 +35,8 @@ TEST(IntegerDivision, SDiv) { Builder.SetInsertPoint(BB); Function::arg_iterator AI = F->arg_begin(); - Value *A = AI++; - Value *B = AI++; + Value *A = &*AI++; + Value *B = &*AI++; Value *Div = Builder.CreateSDiv(A, B); EXPECT_TRUE(BB->front().getOpcode() == Instruction::SDiv); @@ -65,8 +65,8 @@ TEST(IntegerDivision, UDiv) { Builder.SetInsertPoint(BB); Function::arg_iterator AI = F->arg_begin(); - Value *A = AI++; - Value *B = AI++; + Value *A = &*AI++; + Value *B = &*AI++; Value *Div = Builder.CreateUDiv(A, B); EXPECT_TRUE(BB->front().getOpcode() == Instruction::UDiv); @@ -95,8 +95,8 @@ TEST(IntegerDivision, SRem) { Builder.SetInsertPoint(BB); Function::arg_iterator AI = F->arg_begin(); - Value *A = AI++; - Value *B = AI++; + Value *A = &*AI++; + Value *B = &*AI++; Value *Rem = Builder.CreateSRem(A, B); EXPECT_TRUE(BB->front().getOpcode() == Instruction::SRem); @@ -125,8 +125,8 @@ TEST(IntegerDivision, URem) { Builder.SetInsertPoint(BB); Function::arg_iterator AI = F->arg_begin(); - Value *A = AI++; - Value *B = AI++; + Value *A = &*AI++; + Value *B = &*AI++; Value *Rem = Builder.CreateURem(A, B); EXPECT_TRUE(BB->front().getOpcode() == Instruction::URem); @@ -156,8 +156,8 @@ TEST(IntegerDivision, SDiv64) { Builder.SetInsertPoint(BB); Function::arg_iterator AI = F->arg_begin(); - Value *A = AI++; - Value *B = AI++; + Value *A = &*AI++; + Value *B = &*AI++; Value *Div = Builder.CreateSDiv(A, B); EXPECT_TRUE(BB->front().getOpcode() == Instruction::SDiv); @@ -186,8 +186,8 @@ TEST(IntegerDivision, UDiv64) { Builder.SetInsertPoint(BB); Function::arg_iterator AI = F->arg_begin(); - Value *A = AI++; - Value *B = AI++; + Value *A = &*AI++; + Value *B = &*AI++; Value *Div = Builder.CreateUDiv(A, B); EXPECT_TRUE(BB->front().getOpcode() == Instruction::UDiv); @@ -216,8 +216,8 @@ TEST(IntegerDivision, SRem64) { Builder.SetInsertPoint(BB); Function::arg_iterator AI = F->arg_begin(); - Value *A = AI++; - Value *B = AI++; + Value *A = &*AI++; + Value *B = &*AI++; Value *Rem = Builder.CreateSRem(A, B); EXPECT_TRUE(BB->front().getOpcode() == Instruction::SRem); @@ -246,8 +246,8 @@ TEST(IntegerDivision, URem64) { Builder.SetInsertPoint(BB); Function::arg_iterator AI = F->arg_begin(); - Value *A = AI++; - Value *B = AI++; + Value *A = &*AI++; + Value *B = &*AI++; Value *Rem = Builder.CreateURem(A, B); EXPECT_TRUE(BB->front().getOpcode() == Instruction::URem); -- 2.34.1