[llvm] 32b38d2 - [NFC] Rename Instruction::insertAt() to Instruction::insertInto(), to be consistent with BasicBlock::insertInto()
Vasileios Porpodas via llvm-commits
llvm-commits at lists.llvm.org
Thu Dec 15 12:28:19 PST 2022
Author: Vasileios Porpodas
Date: 2022-12-15T12:27:45-08:00
New Revision: 32b38d248fd3c75abc5c86ab6677b6cb08a703cc
URL: https://github.com/llvm/llvm-project/commit/32b38d248fd3c75abc5c86ab6677b6cb08a703cc
DIFF: https://github.com/llvm/llvm-project/commit/32b38d248fd3c75abc5c86ab6677b6cb08a703cc.diff
LOG: [NFC] Rename Instruction::insertAt() to Instruction::insertInto(), to be consistent with BasicBlock::insertInto()
Differential Revision: https://reviews.llvm.org/D140085
Added:
Modified:
clang/lib/CodeGen/CGCleanup.cpp
llvm/docs/ProgrammersManual.rst
llvm/examples/BrainF/BrainF.cpp
llvm/examples/ModuleMaker/ModuleMaker.cpp
llvm/include/llvm/IR/BasicBlock.h
llvm/include/llvm/IR/IRBuilder.h
llvm/include/llvm/IR/Instruction.h
llvm/include/llvm/Transforms/InstCombine/InstCombiner.h
llvm/lib/AsmParser/LLParser.cpp
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
llvm/lib/CodeGen/WinEHPrepare.cpp
llvm/lib/IR/Instruction.cpp
llvm/lib/IR/Instructions.cpp
llvm/lib/Target/Hexagon/HexagonLoopIdiomRecognition.cpp
llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
llvm/lib/Transforms/IPO/IROutliner.cpp
llvm/lib/Transforms/InstCombine/InstCombineInternal.h
llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp
llvm/lib/Transforms/Scalar/JumpThreading.cpp
llvm/lib/Transforms/Scalar/LICM.cpp
llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
llvm/lib/Transforms/Scalar/TLSVariableHoist.cpp
llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
llvm/lib/Transforms/Utils/CloneFunction.cpp
llvm/lib/Transforms/Utils/CodeExtractor.cpp
llvm/lib/Transforms/Utils/LibCallsShrinkWrap.cpp
llvm/lib/Transforms/Utils/LowerSwitch.cpp
llvm/lib/Transforms/Utils/SimplifyCFG.cpp
llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
llvm/unittests/Analysis/MemorySSATest.cpp
llvm/unittests/Analysis/ValueTrackingTest.cpp
llvm/unittests/IR/InstructionsTest.cpp
Removed:
################################################################################
diff --git a/clang/lib/CodeGen/CGCleanup.cpp b/clang/lib/CodeGen/CGCleanup.cpp
index 94e25ae8f4476..43758ac27e439 100644
--- a/clang/lib/CodeGen/CGCleanup.cpp
+++ b/clang/lib/CodeGen/CGCleanup.cpp
@@ -942,7 +942,7 @@ void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) {
// Append the prepared cleanup prologue from above.
llvm::BasicBlock *NormalExit = Builder.GetInsertBlock();
for (unsigned I = 0, E = InstsToAppend.size(); I != E; ++I)
- InstsToAppend[I]->insertAt(NormalExit, NormalExit->end());
+ InstsToAppend[I]->insertInto(NormalExit, NormalExit->end());
// Optimistically hope that any fixups will continue falling through.
for (unsigned I = FixupDepth, E = EHStack.getNumBranchFixups();
diff --git a/llvm/docs/ProgrammersManual.rst b/llvm/docs/ProgrammersManual.rst
index 242b87e3dbe32..868e6851944b1 100644
--- a/llvm/docs/ProgrammersManual.rst
+++ b/llvm/docs/ProgrammersManual.rst
@@ -2861,7 +2861,7 @@ sequence of instructions that form a ``BasicBlock``:
BasicBlock *pb = ...;
auto *newInst = new Instruction(...);
- newInst->insertAt(pb, pb->end()); // Appends newInst to pb
+ newInst->insertInto(pb, pb->end()); // Appends newInst to pb
becomes:
diff --git a/llvm/examples/BrainF/BrainF.cpp b/llvm/examples/BrainF/BrainF.cpp
index 5d0cbd8d8f87e..b3ff5574d3fc7 100644
--- a/llvm/examples/BrainF/BrainF.cpp
+++ b/llvm/examples/BrainF/BrainF.cpp
@@ -96,7 +96,7 @@ void BrainF::header(LLVMContext& C) {
allocsize = ConstantExpr::getTruncOrBitCast(allocsize, IntPtrTy);
ptr_arr = CallInst::CreateMalloc(BB, IntPtrTy, Int8Ty, allocsize, val_mem,
nullptr, "arr");
- cast<Instruction>(ptr_arr)->insertAt(BB, BB->end());
+ cast<Instruction>(ptr_arr)->insertInto(BB, BB->end());
//call void @llvm.memset.p0i8.i32(i8 *%arr, i8 0, i32 %d, i1 0)
{
@@ -128,7 +128,7 @@ void BrainF::header(LLVMContext& C) {
endbb = BasicBlock::Create(C, label, brainf_func);
//call free(i8 *%arr)
- CallInst::CreateFree(ptr_arr, endbb)->insertAt(endbb, endbb->end());
+ CallInst::CreateFree(ptr_arr, endbb)->insertInto(endbb, endbb->end());
//ret void
ReturnInst::Create(C, endbb);
diff --git a/llvm/examples/ModuleMaker/ModuleMaker.cpp b/llvm/examples/ModuleMaker/ModuleMaker.cpp
index 033f91d0830f2..a43b344a79335 100644
--- a/llvm/examples/ModuleMaker/ModuleMaker.cpp
+++ b/llvm/examples/ModuleMaker/ModuleMaker.cpp
@@ -55,10 +55,10 @@ int main() {
"addresult");
// explicitly insert it into the basic block...
- Add->insertAt(BB, BB->end());
+ Add->insertInto(BB, BB->end());
// Create the return instruction and add it to the basic block
- ReturnInst::Create(Context, Add)->insertAt(BB, BB->end());
+ ReturnInst::Create(Context, Add)->insertInto(BB, BB->end());
// Output the bitcode file to stdout
WriteBitcodeToFile(*M, outs());
diff --git a/llvm/include/llvm/IR/BasicBlock.h b/llvm/include/llvm/IR/BasicBlock.h
index f01c14fc3d8d1..71d9ada691489 100644
--- a/llvm/include/llvm/IR/BasicBlock.h
+++ b/llvm/include/llvm/IR/BasicBlock.h
@@ -92,8 +92,8 @@ class BasicBlock final : public Value, // Basic blocks are data objects also
// These functions and classes need access to the instruction list.
friend void Instruction::removeFromParent();
friend iplist<Instruction>::iterator Instruction::eraseFromParent();
- friend BasicBlock::iterator Instruction::insertAt(BasicBlock *BB,
- BasicBlock::iterator It);
+ friend BasicBlock::iterator Instruction::insertInto(BasicBlock *BB,
+ BasicBlock::iterator It);
friend class llvm::SymbolTableListTraits<llvm::Instruction>;
friend class llvm::ilist_node_with_parent<llvm::Instruction, llvm::BasicBlock>;
@@ -378,7 +378,7 @@ class BasicBlock final : public Value, // Basic blocks are data objects also
/// Return the underlying instruction list container.
/// This is deliberately private because we have implemented an adequate set
/// of functions to modify the list, including BasicBlock::splice(),
- /// BasicBlock::erase(), Instruction::insertAt() etc.
+ /// BasicBlock::erase(), Instruction::insertInto() etc.
const InstListType &getInstList() const { return InstList; }
InstListType &getInstList() { return InstList; }
diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h
index 44baf639bbb24..52bd48b344c0b 100644
--- a/llvm/include/llvm/IR/IRBuilder.h
+++ b/llvm/include/llvm/IR/IRBuilder.h
@@ -66,7 +66,7 @@ class IRBuilderDefaultInserter {
BasicBlock *BB,
BasicBlock::iterator InsertPt) const {
if (BB)
- I->insertAt(BB, InsertPt);
+ I->insertInto(BB, InsertPt);
I->setName(Name);
}
};
diff --git a/llvm/include/llvm/IR/Instruction.h b/llvm/include/llvm/IR/Instruction.h
index 0954c90626295..98075554cfe79 100644
--- a/llvm/include/llvm/IR/Instruction.h
+++ b/llvm/include/llvm/IR/Instruction.h
@@ -128,10 +128,10 @@ class Instruction : public User,
/// specified instruction.
void insertAfter(Instruction *InsertPos);
- /// Inserts an unlinked instruction into \p BB at position \p It and returns
- /// the iterator of the inserted instruction.
+ /// Inserts an unlinked instruction into \p ParentBB at position \p It and
+ /// returns the iterator of the inserted instruction.
SymbolTableList<Instruction>::iterator
- insertAt(BasicBlock *BB, SymbolTableList<Instruction>::iterator It);
+ insertInto(BasicBlock *ParentBB, SymbolTableList<Instruction>::iterator It);
/// Unlink this instruction from its current basic block and insert it into
/// the basic block that MovePos lives in, right before MovePos.
diff --git a/llvm/include/llvm/Transforms/InstCombine/InstCombiner.h b/llvm/include/llvm/Transforms/InstCombine/InstCombiner.h
index 552ba88132204..609c8c1c17207 100644
--- a/llvm/include/llvm/Transforms/InstCombine/InstCombiner.h
+++ b/llvm/include/llvm/Transforms/InstCombine/InstCombiner.h
@@ -397,7 +397,7 @@ class LLVM_LIBRARY_VISIBILITY InstCombiner {
assert(New && !New->getParent() &&
"New instruction already inserted into a basic block!");
BasicBlock *BB = Old.getParent();
- New->insertAt(BB, Old.getIterator()); // Insert inst
+ New->insertInto(BB, Old.getIterator()); // Insert inst
Worklist.push(New);
return New;
}
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index ba77b1f570fcd..db45f692561d5 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -6166,7 +6166,7 @@ bool LLParser::parseBasicBlock(PerFunctionState &PFS) {
llvm_unreachable("Unknown parseInstruction result!");
case InstError: return true;
case InstNormal:
- Inst->insertAt(BB, BB->end());
+ Inst->insertInto(BB, BB->end());
// With a normal result, we check to see if the instruction is followed by
// a comma and metadata.
@@ -6175,7 +6175,7 @@ bool LLParser::parseBasicBlock(PerFunctionState &PFS) {
return true;
break;
case InstExtraComma:
- Inst->insertAt(BB, BB->end());
+ Inst->insertInto(BB, BB->end());
// If the instruction parser ate an extra comma at the end of it, it
// *must* be followed by metadata.
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 0aeb1bcf8a788..a2de984fe0406 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -4836,7 +4836,7 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
if (Temp) {
InstructionList.push_back(Temp);
assert(CurBB && "No current BB?");
- Temp->insertAt(CurBB, CurBB->end());
+ Temp->insertInto(CurBB, CurBB->end());
}
} else {
auto CastOp = (Instruction::CastOps)Opc;
@@ -6084,7 +6084,7 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
// Before weak cmpxchgs existed, the instruction simply returned the
// value loaded from memory, so bitcode files from that era will be
// expecting the first component of a modern cmpxchg.
- I->insertAt(CurBB, CurBB->end());
+ I->insertInto(CurBB, CurBB->end());
I = ExtractValueInst::Create(I, 0);
ResTypeID = CmpTypeID;
} else {
@@ -6408,7 +6408,7 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
I->deleteValue();
return error("Operand bundles found with no consumer");
}
- I->insertAt(CurBB, CurBB->end());
+ I->insertInto(CurBB, CurBB->end());
// If this was a terminator instruction, move to the next block.
if (I->isTerminator()) {
diff --git a/llvm/lib/CodeGen/WinEHPrepare.cpp b/llvm/lib/CodeGen/WinEHPrepare.cpp
index 15d97d3783422..dfca2be0a114f 100644
--- a/llvm/lib/CodeGen/WinEHPrepare.cpp
+++ b/llvm/lib/CodeGen/WinEHPrepare.cpp
@@ -1212,8 +1212,8 @@ void WinEHPrepare::replaceUseWithLoad(Value *V, Use &U, AllocaInst *&SpillSlot,
BranchInst *Goto = cast<BranchInst>(IncomingBlock->getTerminator());
Goto->removeFromParent();
CatchRet->removeFromParent();
- CatchRet->insertAt(IncomingBlock, IncomingBlock->end());
- Goto->insertAt(NewBlock, NewBlock->end());
+ CatchRet->insertInto(IncomingBlock, IncomingBlock->end());
+ Goto->insertInto(NewBlock, NewBlock->end());
Goto->setSuccessor(0, PHIBlock);
CatchRet->setSuccessor(NewBlock);
// Update the color mapping for the newly split edge.
diff --git a/llvm/lib/IR/Instruction.cpp b/llvm/lib/IR/Instruction.cpp
index fa91c937145d6..242b242a8ce26 100644
--- a/llvm/lib/IR/Instruction.cpp
+++ b/llvm/lib/IR/Instruction.cpp
@@ -28,7 +28,7 @@ Instruction::Instruction(Type *ty, unsigned it, Use *Ops, unsigned NumOps,
if (InsertBefore) {
BasicBlock *BB = InsertBefore->getParent();
assert(BB && "Instruction to insert before is not in a basic block!");
- insertAt(BB, InsertBefore->getIterator());
+ insertInto(BB, InsertBefore->getIterator());
}
}
@@ -38,7 +38,7 @@ Instruction::Instruction(Type *ty, unsigned it, Use *Ops, unsigned NumOps,
// append this instruction into the basic block
assert(InsertAtEnd && "Basic block to append to may not be NULL!");
- insertAt(InsertAtEnd, InsertAtEnd->end());
+ insertInto(InsertAtEnd, InsertAtEnd->end());
}
Instruction::~Instruction() {
@@ -85,20 +85,21 @@ iplist<Instruction>::iterator Instruction::eraseFromParent() {
/// Insert an unlinked instruction into a basic block immediately before the
/// specified instruction.
void Instruction::insertBefore(Instruction *InsertPos) {
- insertAt(InsertPos->getParent(), InsertPos->getIterator());
+ insertInto(InsertPos->getParent(), InsertPos->getIterator());
}
/// Insert an unlinked instruction into a basic block immediately after the
/// specified instruction.
void Instruction::insertAfter(Instruction *InsertPos) {
- insertAt(InsertPos->getParent(), std::next(InsertPos->getIterator()));
+ insertInto(InsertPos->getParent(), std::next(InsertPos->getIterator()));
}
-BasicBlock::iterator Instruction::insertAt(BasicBlock *BB,
- BasicBlock::iterator It) {
+BasicBlock::iterator Instruction::insertInto(BasicBlock *ParentBB,
+ BasicBlock::iterator It) {
assert(getParent() == nullptr && "Expected detached instruction");
- assert((It == BB->end() || It->getParent() == BB) && "It not in BB");
- return BB->getInstList().insert(It, this);
+ assert((It == ParentBB->end() || It->getParent() == ParentBB) &&
+ "It not in ParentBB");
+ return ParentBB->getInstList().insert(It, this);
}
/// Unlink this instruction from its current basic block and insert it into the
diff --git a/llvm/lib/IR/Instructions.cpp b/llvm/lib/IR/Instructions.cpp
index 4ca132342d1ee..24afd66bef182 100644
--- a/llvm/lib/IR/Instructions.cpp
+++ b/llvm/lib/IR/Instructions.cpp
@@ -824,7 +824,7 @@ static Instruction *createMalloc(Instruction *InsertBefore,
MCall = CallInst::Create(MallocFunc, AllocSize, OpB, "malloccall");
Result = MCall;
if (Result->getType() != AllocPtrType) {
- MCall->insertAt(InsertAtEnd, InsertAtEnd->end());
+ MCall->insertInto(InsertAtEnd, InsertAtEnd->end());
// Create a cast instruction to convert to the right type...
Result = new BitCastInst(MCall, AllocPtrType, Name);
}
@@ -2815,7 +2815,7 @@ UnaryOperator *UnaryOperator::Create(UnaryOps Op, Value *S,
const Twine &Name,
BasicBlock *InsertAtEnd) {
UnaryOperator *Res = Create(Op, S, Name);
- Res->insertAt(InsertAtEnd, InsertAtEnd->end());
+ Res->insertInto(InsertAtEnd, InsertAtEnd->end());
return Res;
}
@@ -2946,7 +2946,7 @@ BinaryOperator *BinaryOperator::Create(BinaryOps Op, Value *S1, Value *S2,
const Twine &Name,
BasicBlock *InsertAtEnd) {
BinaryOperator *Res = Create(Op, S1, S2, Name);
- Res->insertAt(InsertAtEnd, InsertAtEnd->end());
+ Res->insertInto(InsertAtEnd, InsertAtEnd->end());
return Res;
}
diff --git a/llvm/lib/Target/Hexagon/HexagonLoopIdiomRecognition.cpp b/llvm/lib/Target/Hexagon/HexagonLoopIdiomRecognition.cpp
index cdb2d134d08d6..113e63fdb934e 100644
--- a/llvm/lib/Target/Hexagon/HexagonLoopIdiomRecognition.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonLoopIdiomRecognition.cpp
@@ -522,7 +522,7 @@ void Simplifier::Context::link(Instruction *I, BasicBlock *B,
link(OpI, B, At);
}
- I->insertAt(B, At);
+ I->insertInto(B, At);
}
Value *Simplifier::Context::materialize(BasicBlock *B,
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
index 064890cf89eab..b3fe110a092bd 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyFixFunctionBitcasts.cpp
@@ -141,7 +141,7 @@ static Function *createWrapper(Function *F, FunctionType *Ty) {
if (CastInst::isBitOrNoopPointerCastable(ArgType, ParamType, DL)) {
Instruction *PtrCast =
CastInst::CreateBitOrPointerCast(AI, ParamType, "cast");
- PtrCast->insertAt(BB, BB->end());
+ PtrCast->insertInto(BB, BB->end());
Args.push_back(PtrCast);
} else if (ArgType->isStructTy() || ParamType->isStructTy()) {
LLVM_DEBUG(dbgs() << "createWrapper: struct param type in bitcast: "
@@ -181,7 +181,7 @@ static Function *createWrapper(Function *F, FunctionType *Ty) {
DL)) {
Instruction *Cast =
CastInst::CreateBitOrPointerCast(Call, RtnType, "cast");
- Cast->insertAt(BB, BB->end());
+ Cast->insertInto(BB, BB->end());
ReturnInst::Create(M->getContext(), Cast, BB);
} else if (RtnType->isStructTy() || ExpectedRtnType->isStructTy()) {
LLVM_DEBUG(dbgs() << "createWrapper: struct return type in bitcast: "
diff --git a/llvm/lib/Transforms/IPO/IROutliner.cpp b/llvm/lib/Transforms/IPO/IROutliner.cpp
index 70ba9731e40b3..3bd77a4a34233 100644
--- a/llvm/lib/Transforms/IPO/IROutliner.cpp
+++ b/llvm/lib/Transforms/IPO/IROutliner.cpp
@@ -1873,7 +1873,7 @@ replaceArgumentUses(OutlinableRegion &Region,
StoreInst *NewI = cast<StoreInst>(I->clone());
NewI->setDebugLoc(DebugLoc());
BasicBlock *OutputBB = VBBIt->second;
- NewI->insertAt(OutputBB, OutputBB->end());
+ NewI->insertInto(OutputBB, OutputBB->end());
LLVM_DEBUG(dbgs() << "Move store for instruction " << *I << " to "
<< *OutputBB << "\n");
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineInternal.h b/llvm/lib/Transforms/InstCombine/InstCombineInternal.h
index ee0ea357542b0..ed12933c155d3 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombineInternal.h
+++ b/llvm/lib/Transforms/InstCombine/InstCombineInternal.h
@@ -391,7 +391,7 @@ class LLVM_LIBRARY_VISIBILITY InstCombinerImpl final
assert(New && !New->getParent() &&
"New instruction already inserted into a basic block!");
BasicBlock *BB = Old.getParent();
- New->insertAt(BB, Old.getIterator()); // Insert inst
+ New->insertInto(BB, Old.getIterator()); // Insert inst
Worklist.add(New);
return New;
}
diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
index 1d344636926eb..736b9aa8ec244 100644
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -2213,7 +2213,7 @@ Instruction *InstCombinerImpl::visitGEPOfBitcast(BitCastInst *BCI,
if (Instruction *I = visitBitCast(*BCI)) {
if (I != BCI) {
I->takeName(BCI);
- I->insertAt(BCI->getParent(), BCI->getIterator());
+ I->insertInto(BCI->getParent(), BCI->getIterator());
replaceInstUsesWith(*BCI, I);
}
return &GEP;
@@ -2419,7 +2419,7 @@ Instruction *InstCombinerImpl::visitGetElementPtrInst(GetElementPtrInst &GEP) {
NewGEP->setOperand(DI, NewPN);
}
- NewGEP->insertAt(GEP.getParent(), GEP.getParent()->getFirstInsertionPt());
+ NewGEP->insertInto(GEP.getParent(), GEP.getParent()->getFirstInsertionPt());
return replaceOperand(GEP, 0, NewGEP);
}
@@ -4332,7 +4332,7 @@ bool InstCombinerImpl::run() {
InsertPos = InstParent->getFirstNonPHI()->getIterator();
}
- Result->insertAt(InstParent, InsertPos);
+ Result->insertInto(InstParent, InsertPos);
// Push the new instruction and any users onto the worklist.
Worklist.pushUsersToWorkList(*Result);
diff --git a/llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp b/llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
index 9568c6605fd64..096faad245ccc 100644
--- a/llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ControlHeightReduction.cpp
@@ -1837,7 +1837,7 @@ BranchInst *CHR::createMergedBranch(BasicBlock *PreEntryBlock,
BranchInst *NewBR = BranchInst::Create(NewEntryBlock,
cast<BasicBlock>(VMap[NewEntryBlock]),
ConstantInt::getTrue(F.getContext()));
- NewBR->insertAt(PreEntryBlock, PreEntryBlock->end());
+ NewBR->insertInto(PreEntryBlock, PreEntryBlock->end());
assert(NewEntryBlock->getSinglePredecessor() == EntryBlock &&
"NewEntryBlock's only pred must be EntryBlock");
return NewBR;
diff --git a/llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp b/llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp
index 5fa1d680a1614..35db8483fc913 100644
--- a/llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp
+++ b/llvm/lib/Transforms/Instrumentation/PGOMemOPSizeOpt.cpp
@@ -422,7 +422,7 @@ bool MemOPSizeOpt::perform(MemOp MO) {
assert(SizeType && "Expected integer type size argument.");
ConstantInt *CaseSizeId = ConstantInt::get(SizeType, SizeId);
NewMO.setLength(CaseSizeId);
- NewMO.I->insertAt(CaseBB, CaseBB->end());
+ NewMO.I->insertInto(CaseBB, CaseBB->end());
IRBuilder<> IRBCase(CaseBB);
IRBCase.CreateBr(MergeBB);
SI->addCase(CaseSizeId, CaseBB);
diff --git a/llvm/lib/Transforms/Scalar/JumpThreading.cpp b/llvm/lib/Transforms/Scalar/JumpThreading.cpp
index dc68cd31690a7..69d0c2f6a32f8 100644
--- a/llvm/lib/Transforms/Scalar/JumpThreading.cpp
+++ b/llvm/lib/Transforms/Scalar/JumpThreading.cpp
@@ -2107,7 +2107,7 @@ JumpThreadingPass::cloneInstructions(BasicBlock::iterator BI,
for (; BI != BE; ++BI) {
Instruction *New = BI->clone();
New->setName(BI->getName());
- New->insertAt(NewBB, NewBB->end());
+ New->insertInto(NewBB, NewBB->end());
ValueMapping[&*BI] = New;
adaptNoAliasScopes(New, ClonedScopes, Context);
@@ -2700,7 +2700,7 @@ bool JumpThreadingPass::duplicateCondBranchOnPHIIntoPred(
if (New) {
// Otherwise, insert the new instruction into the block.
New->setName(BI->getName());
- New->insertAt(PredBB, OldPredBranch->getIterator());
+ New->insertInto(PredBB, OldPredBranch->getIterator());
// Update Dominance from simplified New instruction operands.
for (unsigned i = 0, e = New->getNumOperands(); i != e; ++i)
if (BasicBlock *SuccBB = dyn_cast<BasicBlock>(New->getOperand(i)))
@@ -2754,7 +2754,7 @@ void JumpThreadingPass::unfoldSelectInstr(BasicBlock *Pred, BasicBlock *BB,
BB->getParent(), BB);
// Move the unconditional branch to NewBB.
PredTerm->removeFromParent();
- PredTerm->insertAt(NewBB, NewBB->end());
+ PredTerm->insertInto(NewBB, NewBB->end());
// Create a conditional branch and update PHI nodes.
auto *BI = BranchInst::Create(NewBB, BB, SI->getCondition(), Pred);
BI->applyMergedLocation(PredTerm->getDebugLoc(), SI->getDebugLoc());
diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp
index 19b2de6eda608..d3739f31bc57e 100644
--- a/llvm/lib/Transforms/Scalar/LICM.cpp
+++ b/llvm/lib/Transforms/Scalar/LICM.cpp
@@ -1430,7 +1430,7 @@ static Instruction *cloneInstructionInExitBlock(
New = I.clone();
}
- New->insertAt(&ExitBlock, ExitBlock.getFirstInsertionPt());
+ New->insertInto(&ExitBlock, ExitBlock.getFirstInsertionPt());
if (!I.getName().empty())
New->setName(I.getName() + ".le");
diff --git a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
index 34dce23a5aa4f..ec6523bef1b0c 100644
--- a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
@@ -2535,7 +2535,7 @@ LSRInstance::OptimizeLoopTermCond() {
ICmpInst *OldCond = Cond;
Cond = cast<ICmpInst>(Cond->clone());
Cond->setName(L->getHeader()->getName() + ".termcond");
- Cond->insertAt(ExitingBlock, TermBr->getIterator());
+ Cond->insertInto(ExitingBlock, TermBr->getIterator());
// Clone the IVUse, as the old use still exists!
CondUse = &IU.AddUser(Cond, CondUse->getOperandValToReplace());
diff --git a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
index c9dec06c43162..c123931105f1f 100644
--- a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
+++ b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
@@ -255,7 +255,7 @@ static void buildPartialInvariantUnswitchConditionalBranch(
for (auto *Val : reverse(ToDuplicate)) {
Instruction *Inst = cast<Instruction>(Val);
Instruction *NewInst = Inst->clone();
- NewInst->insertAt(&BB, BB.end());
+ NewInst->insertInto(&BB, BB.end());
RemapInstruction(NewInst, VMap,
RF_NoModuleLevelChanges | RF_IgnoreMissingLocals);
VMap[Val] = NewInst;
@@ -585,7 +585,7 @@ static bool unswitchTrivialBranch(Loop &L, BranchInst &BI, DominatorTree &DT,
if (MSSAU) {
// Temporarily clone the terminator, to make MSSA update cheaper by
// separating "insert edge" updates from "remove edge" ones.
- BI.clone()->insertAt(ParentBB, ParentBB->end());
+ BI.clone()->insertInto(ParentBB, ParentBB->end());
} else {
// Create a new unconditional branch that will continue the loop as a new
// terminator.
@@ -2255,7 +2255,7 @@ static void unswitchNontrivialInvariants(
// Keep a clone of the terminator for MSSA updates.
Instruction *NewTI = TI.clone();
- NewTI->insertAt(ParentBB, ParentBB->end());
+ NewTI->insertInto(ParentBB, ParentBB->end());
// First wire up the moved terminator to the preheaders.
if (BI) {
diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
index 76227045e7cfa..e014f5d1eb042 100644
--- a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
+++ b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
@@ -108,12 +108,12 @@ performBlockTailMerging(Function &F, ArrayRef<BasicBlock *> BBs,
std::get<1>(I) = PHINode::Create(std::get<0>(I)->getType(),
/*NumReservedValues=*/BBs.size(),
CanonicalBB->getName() + ".op");
- std::get<1>(I)->insertAt(CanonicalBB, CanonicalBB->end());
+ std::get<1>(I)->insertInto(CanonicalBB, CanonicalBB->end());
}
// Make it so that this canonical block actually has the right
// terminator.
CanonicalTerm = Term->clone();
- CanonicalTerm->insertAt(CanonicalBB, CanonicalBB->end());
+ CanonicalTerm->insertInto(CanonicalBB, CanonicalBB->end());
// If the canonical terminator has operands, rewrite it to take PHI's.
for (auto I : zip(NewOps, CanonicalTerm->operands()))
std::get<1>(I) = std::get<0>(I);
diff --git a/llvm/lib/Transforms/Scalar/TLSVariableHoist.cpp b/llvm/lib/Transforms/Scalar/TLSVariableHoist.cpp
index 312471465fe9d..59edc68684d73 100644
--- a/llvm/lib/Transforms/Scalar/TLSVariableHoist.cpp
+++ b/llvm/lib/Transforms/Scalar/TLSVariableHoist.cpp
@@ -234,7 +234,7 @@ Instruction *TLSVariableHoistPass::genBitCastInst(Function &Fn,
BasicBlock::iterator Iter = findInsertPos(Fn, GV, PosBB);
Type *Ty = GV->getType();
auto *CastInst = new BitCastInst(GV, Ty, "tls_bitcast");
- CastInst->insertAt(PosBB, Iter);
+ CastInst->insertInto(PosBB, Iter);
return CastInst;
}
diff --git a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
index a699540076dbb..acde526854363 100644
--- a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
+++ b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
@@ -565,7 +565,7 @@ void llvm::ReplaceInstWithInst(BasicBlock *BB, BasicBlock::iterator &BI,
I->setDebugLoc(BI->getDebugLoc());
// Insert the new instruction into the basic block...
- BasicBlock::iterator New = I->insertAt(BB, BI);
+ BasicBlock::iterator New = I->insertInto(BB, BI);
// Replace all uses of the old instruction, and delete it.
ReplaceInstWithValue(BI, I);
@@ -1343,12 +1343,12 @@ static void SplitLandingPadPredecessorsImpl(
LandingPadInst *LPad = OrigBB->getLandingPadInst();
Instruction *Clone1 = LPad->clone();
Clone1->setName(Twine("lpad") + Suffix1);
- Clone1->insertAt(NewBB1, NewBB1->getFirstInsertionPt());
+ Clone1->insertInto(NewBB1, NewBB1->getFirstInsertionPt());
if (NewBB2) {
Instruction *Clone2 = LPad->clone();
Clone2->setName(Twine("lpad") + Suffix2);
- Clone2->insertAt(NewBB2, NewBB2->getFirstInsertionPt());
+ Clone2->insertInto(NewBB2, NewBB2->getFirstInsertionPt());
// Create a PHI node for the two cloned landingpad instructions only
// if the original landingpad instruction has some uses.
@@ -1399,7 +1399,7 @@ ReturnInst *llvm::FoldReturnIntoUncondBranch(ReturnInst *RI, BasicBlock *BB,
Instruction *UncondBranch = Pred->getTerminator();
// Clone the return and add it to the end of the predecessor.
Instruction *NewRet = RI->clone();
- NewRet->insertAt(Pred, Pred->end());
+ NewRet->insertInto(Pred, Pred->end());
// If the return instruction returns a value, and if the value was a
// PHI node in "BB", propagate the right value into the return.
@@ -1411,7 +1411,7 @@ ReturnInst *llvm::FoldReturnIntoUncondBranch(ReturnInst *RI, BasicBlock *BB,
// return instruction.
V = BCI->getOperand(0);
NewBC = BCI->clone();
- NewBC->insertAt(Pred, NewRet->getIterator());
+ NewBC->insertInto(Pred, NewRet->getIterator());
Op = NewBC;
}
@@ -1421,9 +1421,9 @@ ReturnInst *llvm::FoldReturnIntoUncondBranch(ReturnInst *RI, BasicBlock *BB,
NewEV = EVI->clone();
if (NewBC) {
NewBC->setOperand(0, NewEV);
- NewEV->insertAt(Pred, NewBC->getIterator());
+ NewEV->insertInto(Pred, NewBC->getIterator());
} else {
- NewEV->insertAt(Pred, NewRet->getIterator());
+ NewEV->insertInto(Pred, NewRet->getIterator());
Op = NewEV;
}
}
diff --git a/llvm/lib/Transforms/Utils/CloneFunction.cpp b/llvm/lib/Transforms/Utils/CloneFunction.cpp
index c6c864e461946..1051b62ab2942 100644
--- a/llvm/lib/Transforms/Utils/CloneFunction.cpp
+++ b/llvm/lib/Transforms/Utils/CloneFunction.cpp
@@ -58,7 +58,7 @@ BasicBlock *llvm::CloneBasicBlock(const BasicBlock *BB, ValueToValueMapTy &VMap,
Instruction *NewInst = I.clone();
if (I.hasName())
NewInst->setName(I.getName() + NameSuffix);
- NewInst->insertAt(NewBB, NewBB->end());
+ NewInst->insertInto(NewBB, NewBB->end());
VMap[&I] = NewInst; // Add instruction map to value.
if (isa<CallInst>(I) && !I.isDebugOrPseudoInst()) {
@@ -521,7 +521,7 @@ void PruningFunctionCloner::CloneBlock(
if (II->hasName())
NewInst->setName(II->getName() + NameSuffix);
VMap[&*II] = NewInst; // Add instruction map to value.
- NewInst->insertAt(NewBB, NewBB->end());
+ NewInst->insertInto(NewBB, NewBB->end());
if (isa<CallInst>(II) && !II->isDebugOrPseudoInst()) {
hasCalls = true;
hasMemProfMetadata |= II->hasMetadata(LLVMContext::MD_memprof);
@@ -583,7 +583,7 @@ void PruningFunctionCloner::CloneBlock(
Instruction *NewInst = OldTI->clone();
if (OldTI->hasName())
NewInst->setName(OldTI->getName() + NameSuffix);
- NewInst->insertAt(NewBB, NewBB->end());
+ NewInst->insertInto(NewBB, NewBB->end());
VMap[OldTI] = NewInst; // Add instruction map to value.
if (CodeInfo) {
diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
index f07220aadb942..ce6f012860692 100644
--- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp
+++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
@@ -1208,7 +1208,7 @@ CallInst *CodeExtractor::emitCallAndSwitchStatement(Function *newFunction,
Idx[1] = ConstantInt::get(Type::getInt32Ty(Context), i);
GetElementPtrInst *GEP = GetElementPtrInst::Create(
StructArgTy, Struct, Idx, "gep_" + StructValues[i]->getName());
- GEP->insertAt(codeReplacer, codeReplacer->end());
+ GEP->insertInto(codeReplacer, codeReplacer->end());
new StoreInst(StructValues[i], GEP, codeReplacer);
NumAggregatedInputs++;
}
@@ -1226,7 +1226,7 @@ CallInst *CodeExtractor::emitCallAndSwitchStatement(Function *newFunction,
if (auto DL = newFunction->getEntryBlock().getTerminator()->getDebugLoc())
call->setDebugLoc(DL);
}
- call->insertAt(codeReplacer, codeReplacer->end());
+ call->insertInto(codeReplacer, codeReplacer->end());
// Set swifterror parameter attributes.
for (unsigned SwiftErrArgNo : SwiftErrorArgs) {
@@ -1246,7 +1246,7 @@ CallInst *CodeExtractor::emitCallAndSwitchStatement(Function *newFunction,
Idx[1] = ConstantInt::get(Type::getInt32Ty(Context), aggIdx);
GetElementPtrInst *GEP = GetElementPtrInst::Create(
StructArgTy, Struct, Idx, "gep_reload_" + outputs[i]->getName());
- GEP->insertAt(codeReplacer, codeReplacer->end());
+ GEP->insertInto(codeReplacer, codeReplacer->end());
Output = GEP;
++aggIdx;
} else {
@@ -1735,7 +1735,7 @@ CodeExtractor::extractCodeRegion(const CodeExtractorAnalysisCache &CEAC,
});
});
}
- BranchI->insertAt(newFuncRoot, newFuncRoot->end());
+ BranchI->insertInto(newFuncRoot, newFuncRoot->end());
ValueSet SinkingCands, HoistingCands;
BasicBlock *CommonExit = nullptr;
diff --git a/llvm/lib/Transforms/Utils/LibCallsShrinkWrap.cpp b/llvm/lib/Transforms/Utils/LibCallsShrinkWrap.cpp
index f0f6f94fbc97b..5dd469c7af4b8 100644
--- a/llvm/lib/Transforms/Utils/LibCallsShrinkWrap.cpp
+++ b/llvm/lib/Transforms/Utils/LibCallsShrinkWrap.cpp
@@ -496,7 +496,7 @@ void LibCallsShrinkWrap::shrinkWrapCI(CallInst *CI, Value *Cond) {
assert(SuccBB && "The split block should have a single successor");
SuccBB->setName("cdce.end");
CI->removeFromParent();
- CI->insertAt(CallBB, CallBB->getFirstInsertionPt());
+ CI->insertInto(CallBB, CallBB->getFirstInsertionPt());
LLVM_DEBUG(dbgs() << "== Basic Block After ==");
LLVM_DEBUG(dbgs() << *CallBB->getSinglePredecessor() << *CallBB
<< *CallBB->getSingleSuccessor() << "\n");
diff --git a/llvm/lib/Transforms/Utils/LowerSwitch.cpp b/llvm/lib/Transforms/Utils/LowerSwitch.cpp
index 36d3de3bf1615..c6d8c7ba5e84d 100644
--- a/llvm/lib/Transforms/Utils/LowerSwitch.cpp
+++ b/llvm/lib/Transforms/Utils/LowerSwitch.cpp
@@ -301,7 +301,7 @@ BasicBlock *SwitchConvert(CaseItr Begin, CaseItr End, ConstantInt *LowerBound,
NewNode, OrigBlock, Default, UnreachableRanges);
F->insert(++OrigBlock->getIterator(), NewNode);
- Comp->insertAt(NewNode, NewNode->end());
+ Comp->insertInto(NewNode, NewNode->end());
BranchInst::Create(LBranch, RBranch, Comp, NewNode);
return NewNode;
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index 92722d3dd6788..10959311ba083 100644
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -1128,7 +1128,7 @@ static void CloneInstructionsIntoPredecessorBlockAndUpdateSSAUses(
NewBonusInst->dropUndefImplyingAttrsAndUnknownMetadata(
LLVMContext::MD_annotation);
- NewBonusInst->insertAt(PredBlock, PTI->getIterator());
+ NewBonusInst->insertInto(PredBlock, PTI->getIterator());
NewBonusInst->takeName(&BonusInst);
BonusInst.setName(NewBonusInst->getName() + ".old");
@@ -1693,7 +1693,7 @@ bool SimplifyCFGOpt::HoistThenElseCodeToIf(BranchInst *BI,
// Okay, it is safe to hoist the terminator.
Instruction *NT = I1->clone();
- NT->insertAt(BIParent, BI->getIterator());
+ NT->insertInto(BIParent, BI->getIterator());
if (!NT->getType()->isVoidTy()) {
I1->replaceAllUsesWith(NT);
I2->replaceAllUsesWith(NT);
@@ -2497,7 +2497,7 @@ static void MergeCompatibleInvokesImpl(ArrayRef<InvokeInst *> Invokes,
auto *MergedInvoke = cast<InvokeInst>(II0->clone());
// NOTE: all invokes have the same attributes, so no handling needed.
- MergedInvoke->insertAt(MergedInvokeBB, MergedInvokeBB->end());
+ MergedInvoke->insertInto(MergedInvokeBB, MergedInvokeBB->end());
if (!HasNormalDest) {
// This set does not have a normal destination,
@@ -3244,7 +3244,7 @@ FoldCondBranchOnValueKnownInPredecessorImpl(BranchInst *BI, DomTreeUpdater *DTU,
}
if (N) {
// Insert the new instruction into its new home.
- N->insertAt(EdgeBB, InsertPt);
+ N->insertInto(EdgeBB, InsertPt);
// Register the new instruction with the assumption cache if necessary.
if (auto *Assume = dyn_cast<AssumeInst>(N))
diff --git a/llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp b/llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
index d73a511fc8e6c..2b706858cbedd 100644
--- a/llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
+++ b/llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
@@ -90,7 +90,7 @@ bool unifyReturnBlocks(Function &F) {
// If the function doesn't return void... add a PHI node to the block...
PN = PHINode::Create(F.getReturnType(), ReturningBlocks.size(),
"UnifiedRetVal");
- PN->insertAt(NewRetBlock, NewRetBlock->end());
+ PN->insertInto(NewRetBlock, NewRetBlock->end());
ReturnInst::Create(F.getContext(), PN, NewRetBlock);
}
diff --git a/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp b/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
index 7534418629c6d..1286ec9e34b0e 100644
--- a/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
+++ b/llvm/unittests/Analysis/AssumeBundleQueriesTest.cpp
@@ -429,7 +429,7 @@ static void RunRandTest(uint64_t Seed, int Size, int MinCount, int MaxCount,
BasicBlock *BB = BasicBlock::Create(C);
BB->insertInto(F);
Instruction *Ret = ReturnInst::Create(C);
- Ret->insertAt(BB, BB->begin());
+ Ret->insertInto(BB, BB->begin());
Function *FnAssume = Intrinsic::getDeclaration(Mod.get(), Intrinsic::assume);
std::vector<Argument *> ShuffledArgs;
diff --git a/llvm/unittests/Analysis/MemorySSATest.cpp b/llvm/unittests/Analysis/MemorySSATest.cpp
index f5d8b57b7198c..50a7d762a0215 100644
--- a/llvm/unittests/Analysis/MemorySSATest.cpp
+++ b/llvm/unittests/Analysis/MemorySSATest.cpp
@@ -282,7 +282,7 @@ TEST_F(MemorySSATest, SinkLoad) {
// - remove from original block
LoadInst *LoadInstClone = cast<LoadInst>(LoadInst1->clone());
- LoadInstClone->insertAt(Merge, Merge->begin());
+ LoadInstClone->insertInto(Merge, Merge->begin());
MemoryAccess * NewLoadAccess =
Updater.createMemoryAccessInBB(LoadInstClone, nullptr,
LoadInstClone->getParent(),
diff --git a/llvm/unittests/Analysis/ValueTrackingTest.cpp b/llvm/unittests/Analysis/ValueTrackingTest.cpp
index 2e5270ea3a553..7e59841a5aafb 100644
--- a/llvm/unittests/Analysis/ValueTrackingTest.cpp
+++ b/llvm/unittests/Analysis/ValueTrackingTest.cpp
@@ -1624,7 +1624,7 @@ TEST_F(ComputeKnownBitsTest, ComputeKnownBitsUnknownVScale) {
EXPECT_EQ(Known.Zero.getZExtValue(), 0u);
BasicBlock *BB = BasicBlock::Create(Context);
- CI->insertAt(BB, BB->end());
+ CI->insertInto(BB, BB->end());
Known = computeKnownBits(CI, M.getDataLayout(), /* Depth */ 0);
// There is no parent function so we cannot look up the vscale_range
// attribute to determine the number of bits.
diff --git a/llvm/unittests/IR/InstructionsTest.cpp b/llvm/unittests/IR/InstructionsTest.cpp
index 4718aa854f1e1..eb506f6c9e4f3 100644
--- a/llvm/unittests/IR/InstructionsTest.cpp
+++ b/llvm/unittests/IR/InstructionsTest.cpp
@@ -1695,7 +1695,7 @@ TEST(InstructionsTest, InsertAtBegin) {
BasicBlock *BB = &*F->begin();
Instruction *Ret = &*BB->begin();
Instruction *I = BinaryOperator::CreateAdd(ArgA, ArgB);
- auto It = I->insertAt(BB, BB->begin());
+ auto It = I->insertInto(BB, BB->begin());
EXPECT_EQ(&*It, I);
EXPECT_EQ(I->getNextNode(), Ret);
}
@@ -1714,7 +1714,7 @@ TEST(InstructionsTest, InsertAtEnd) {
BasicBlock *BB = &*F->begin();
Instruction *Ret = &*BB->begin();
Instruction *I = BinaryOperator::CreateAdd(ArgA, ArgB);
- auto It = I->insertAt(BB, BB->end());
+ auto It = I->insertInto(BB, BB->end());
EXPECT_EQ(&*It, I);
EXPECT_EQ(Ret->getNextNode(), I);
}
More information about the llvm-commits
mailing list