[llvm] [polly] [NFC][RemoveDIs] Use iterators for insertion at various call-sites (PR #84736)
Stephen Tozer via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 19 08:51:24 PDT 2024
https://github.com/SLTozer updated https://github.com/llvm/llvm-project/pull/84736
>From 1ff5fd2bcffbfb4f1ec82ed329e9b93c2761ed84 Mon Sep 17 00:00:00 2001
From: Jeremy Morse <jeremy.morse at sony.com>
Date: Mon, 11 Mar 2024 09:24:19 +0000
Subject: [PATCH 1/2] [NFC][RemoveDIs] Use iterators for insertion at various
call-sites
These are the last remaining "trivial" changes to passes that use
Instruction pointers for insertion. All of this should be NFC, it's just
changing the spelling of how we identify a position.
In one or two locations, I'm also switching uses of getNextNode etc to
using std::next with iterators. This too should be NFC.
---
llvm/lib/Analysis/PHITransAddr.cpp | 6 ++--
llvm/lib/CodeGen/CodeGenPrepare.cpp | 13 ++++----
llvm/lib/CodeGen/DwarfEHPrepare.cpp | 4 +--
llvm/lib/CodeGen/GCRootLowering.cpp | 6 ++--
llvm/lib/CodeGen/IndirectBrExpandPass.cpp | 8 ++---
llvm/lib/CodeGen/InterleavedAccessPass.cpp | 7 ++--
llvm/lib/CodeGen/IntrinsicLowering.cpp | 2 +-
llvm/lib/CodeGen/JMCInstrumenter.cpp | 2 +-
llvm/lib/CodeGen/SjLjEHPrepare.cpp | 14 ++++----
llvm/lib/CodeGen/WinEHPrepare.cpp | 12 +++----
llvm/lib/Passes/PassBuilder.cpp | 2 +-
.../AArch64/AArch64TargetTransformInfo.cpp | 2 +-
llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp | 8 ++---
.../AMDGPU/AMDGPUPrintfRuntimeBinding.cpp | 15 +++++----
.../Target/ARM/MVEGatherScatterLowering.cpp | 32 +++++++++++--------
.../Target/BPF/BPFAbstractMemberAccess.cpp | 8 ++---
llvm/lib/Target/BPF/BPFPreserveDIType.cpp | 2 +-
llvm/lib/Target/Hexagon/HexagonCommonGEP.cpp | 2 +-
llvm/lib/Target/Mips/Mips16HardFloat.cpp | 2 +-
llvm/lib/Target/NVPTX/NVPTXImageOptimizer.cpp | 2 +-
llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp | 10 +++---
.../Target/NVPTX/NVPTXLowerUnreachable.cpp | 2 +-
llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp | 2 +-
.../Target/PowerPC/PPCLoopInstrFormPrep.cpp | 30 ++++++++++-------
.../RISCV/RISCVGatherScatterLowering.cpp | 2 +-
.../WebAssemblyLowerEmscriptenEHSjLj.cpp | 2 +-
.../WebAssemblyLowerRefTypesIntPtrConv.cpp | 2 +-
llvm/lib/Target/X86/X86LowerAMXType.cpp | 4 +--
polly/lib/CodeGen/IslNodeBuilder.cpp | 6 ++--
polly/lib/CodeGen/LoopGenerators.cpp | 2 +-
polly/lib/Support/ScopHelper.cpp | 2 +-
31 files changed, 113 insertions(+), 100 deletions(-)
diff --git a/llvm/lib/Analysis/PHITransAddr.cpp b/llvm/lib/Analysis/PHITransAddr.cpp
index 5700fd664a4cd3..12379e61d2422a 100644
--- a/llvm/lib/Analysis/PHITransAddr.cpp
+++ b/llvm/lib/Analysis/PHITransAddr.cpp
@@ -369,7 +369,7 @@ Value *PHITransAddr::insertTranslatedSubExpr(
// Otherwise insert a cast at the end of PredBB.
CastInst *New = CastInst::Create(Cast->getOpcode(), OpVal, InVal->getType(),
InVal->getName() + ".phi.trans.insert",
- PredBB->getTerminator());
+ PredBB->getTerminator()->getIterator());
New->setDebugLoc(Inst->getDebugLoc());
NewInsts.push_back(New);
return New;
@@ -387,7 +387,7 @@ Value *PHITransAddr::insertTranslatedSubExpr(
GetElementPtrInst *Result = GetElementPtrInst::Create(
GEP->getSourceElementType(), GEPOps[0], ArrayRef(GEPOps).slice(1),
- InVal->getName() + ".phi.trans.insert", PredBB->getTerminator());
+ InVal->getName() + ".phi.trans.insert", PredBB->getTerminator()->getIterator());
Result->setDebugLoc(Inst->getDebugLoc());
Result->setIsInBounds(GEP->isInBounds());
NewInsts.push_back(Result);
@@ -410,7 +410,7 @@ Value *PHITransAddr::insertTranslatedSubExpr(
BinaryOperator *Res = BinaryOperator::CreateAdd(OpVal, Inst->getOperand(1),
InVal->getName()+".phi.trans.insert",
- PredBB->getTerminator());
+ PredBB->getTerminator()->getIterator());
Res->setHasNoSignedWrap(cast<BinaryOperator>(Inst)->hasNoSignedWrap());
Res->setHasNoUnsignedWrap(cast<BinaryOperator>(Inst)->hasNoUnsignedWrap());
NewInsts.push_back(Res);
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index 36f6cc83be2c3f..1033462d0e25ba 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -2023,7 +2023,7 @@ static bool sinkAndCmp0Expression(Instruction *AndI, const TargetLowering &TLI,
User->getParent() == AndI->getParent() ? AndI : User;
Instruction *InsertedAnd =
BinaryOperator::Create(Instruction::And, AndI->getOperand(0),
- AndI->getOperand(1), "", InsertPt);
+ AndI->getOperand(1), "", InsertPt->getIterator());
// Propagate the debug info.
InsertedAnd->setDebugLoc(AndI->getDebugLoc());
@@ -4119,7 +4119,7 @@ class AddressingModeCombiner {
// Create a Select placeholder with dummy value.
SelectInst *Select = SelectInst::Create(
CurrentSelect->getCondition(), Dummy, Dummy,
- CurrentSelect->getName(), CurrentSelect, CurrentSelect);
+ CurrentSelect->getName(), CurrentSelect->getIterator(), CurrentSelect);
Map[Current] = Select;
ST.insertNewSelect(Select);
// We are interested in True and False values.
@@ -6430,8 +6430,9 @@ bool CodeGenPrepare::optimizePhiType(
ValMap[D] = D->getOperand(0);
DeletedInstrs.insert(D);
} else {
+ BasicBlock::iterator insertPt = std::next(D->getIterator());
ValMap[D] =
- new BitCastInst(D, ConvertTy, D->getName() + ".bc", D->getNextNode());
+ new BitCastInst(D, ConvertTy, D->getName() + ".bc", insertPt);
}
}
for (PHINode *Phi : PhiNodes)
@@ -6452,7 +6453,7 @@ bool CodeGenPrepare::optimizePhiType(
replaceAllUsesWith(U, ValMap[U->getOperand(0)], FreshBBs, IsHugeFunc);
} else {
U->setOperand(0,
- new BitCastInst(ValMap[U->getOperand(0)], PhiTy, "bc", U));
+ new BitCastInst(ValMap[U->getOperand(0)], PhiTy, "bc", U->getIterator()));
}
}
@@ -8348,7 +8349,7 @@ bool CodeGenPrepare::optimizeInst(Instruction *I, ModifyDT &ModifiedDT) {
if (GEPI->hasAllZeroIndices()) {
/// The GEP operand must be a pointer, so must its result -> BitCast
Instruction *NC = new BitCastInst(GEPI->getOperand(0), GEPI->getType(),
- GEPI->getName(), GEPI);
+ GEPI->getName(), GEPI->getIterator());
NC->setDebugLoc(GEPI->getDebugLoc());
replaceAllUsesWith(GEPI, NC, FreshBBs, IsHugeFunc);
RecursivelyDeleteTriviallyDeadInstructions(
@@ -8380,7 +8381,7 @@ bool CodeGenPrepare::optimizeInst(Instruction *I, ModifyDT &ModifiedDT) {
isa<ConstantPointerNull>(Op1);
if (Const0 || Const1) {
if (!Const0 || !Const1) {
- auto *F = new FreezeInst(Const0 ? Op1 : Op0, "", CmpI);
+ auto *F = new FreezeInst(Const0 ? Op1 : Op0, "", CmpI->getIterator());
F->takeName(FI);
CmpI->setOperand(Const0 ? 1 : 0, F);
}
diff --git a/llvm/lib/CodeGen/DwarfEHPrepare.cpp b/llvm/lib/CodeGen/DwarfEHPrepare.cpp
index e7eb34d8e6518c..654458d3b19d11 100644
--- a/llvm/lib/CodeGen/DwarfEHPrepare.cpp
+++ b/llvm/lib/CodeGen/DwarfEHPrepare.cpp
@@ -111,7 +111,7 @@ Value *DwarfEHPrepare::GetExceptionObject(ResumeInst *RI) {
}
if (!ExnObj)
- ExnObj = ExtractValueInst::Create(RI->getOperand(0), 0, "exn.obj", RI);
+ ExnObj = ExtractValueInst::Create(RI->getOperand(0), 0, "exn.obj", RI->getIterator());
RI->eraseFromParent();
@@ -158,7 +158,7 @@ size_t DwarfEHPrepare::pruneUnreachableResumes(
Resumes[ResumesLeft++] = RI;
} else {
BasicBlock *BB = RI->getParent();
- new UnreachableInst(Ctx, RI);
+ new UnreachableInst(Ctx, RI->getIterator());
RI->eraseFromParent();
simplifyCFG(BB, *TTI, DTU);
}
diff --git a/llvm/lib/CodeGen/GCRootLowering.cpp b/llvm/lib/CodeGen/GCRootLowering.cpp
index 894ab9a0486a7b..0d2e0709c0696d 100644
--- a/llvm/lib/CodeGen/GCRootLowering.cpp
+++ b/llvm/lib/CodeGen/GCRootLowering.cpp
@@ -178,7 +178,7 @@ static bool InsertRootInitializers(Function &F, ArrayRef<AllocaInst *> Roots) {
if (!InitedRoots.count(Root)) {
new StoreInst(
ConstantPointerNull::get(cast<PointerType>(Root->getAllocatedType())),
- Root, Root->getNextNode());
+ Root, std::next(Root->getIterator()));
MadeChange = true;
}
@@ -214,7 +214,7 @@ bool DoLowering(Function &F, GCStrategy &S) {
case Intrinsic::gcwrite: {
// Replace a write barrier with a simple store.
Value *St = new StoreInst(CI->getArgOperand(0),
- CI->getArgOperand(2), CI);
+ CI->getArgOperand(2), CI->getIterator());
CI->replaceAllUsesWith(St);
CI->eraseFromParent();
MadeChange = true;
@@ -222,7 +222,7 @@ bool DoLowering(Function &F, GCStrategy &S) {
}
case Intrinsic::gcread: {
// Replace a read barrier with a simple load.
- Value *Ld = new LoadInst(CI->getType(), CI->getArgOperand(1), "", CI);
+ Value *Ld = new LoadInst(CI->getType(), CI->getArgOperand(1), "", CI->getIterator());
Ld->takeName(CI);
CI->replaceAllUsesWith(Ld);
CI->eraseFromParent();
diff --git a/llvm/lib/CodeGen/IndirectBrExpandPass.cpp b/llvm/lib/CodeGen/IndirectBrExpandPass.cpp
index f7b931a3bdac2d..3c6c2db8bbe3c6 100644
--- a/llvm/lib/CodeGen/IndirectBrExpandPass.cpp
+++ b/llvm/lib/CodeGen/IndirectBrExpandPass.cpp
@@ -113,7 +113,7 @@ bool runImpl(Function &F, const TargetLowering *TLI, DomTreeUpdater *DTU) {
// Handle the degenerate case of no successors by replacing the indirectbr
// with unreachable as there is no successor available.
if (IBr->getNumSuccessors() == 0) {
- (void)new UnreachableInst(F.getContext(), IBr);
+ (void)new UnreachableInst(F.getContext(), IBr->getIterator());
IBr->eraseFromParent();
continue;
}
@@ -183,7 +183,7 @@ bool runImpl(Function &F, const TargetLowering *TLI, DomTreeUpdater *DTU) {
for (BasicBlock *SuccBB : IBr->successors())
Updates.push_back({DominatorTree::Delete, IBr->getParent(), SuccBB});
}
- (void)new UnreachableInst(F.getContext(), IBr);
+ (void)new UnreachableInst(F.getContext(), IBr->getIterator());
IBr->eraseFromParent();
}
if (DTU) {
@@ -209,7 +209,7 @@ bool runImpl(Function &F, const TargetLowering *TLI, DomTreeUpdater *DTU) {
auto GetSwitchValue = [CommonITy](IndirectBrInst *IBr) {
return CastInst::CreatePointerCast(
IBr->getAddress(), CommonITy,
- Twine(IBr->getAddress()->getName()) + ".switch_cast", IBr);
+ Twine(IBr->getAddress()->getName()) + ".switch_cast", IBr->getIterator());
};
SmallVector<DominatorTree::UpdateType, 8> Updates;
@@ -243,7 +243,7 @@ bool runImpl(Function &F, const TargetLowering *TLI, DomTreeUpdater *DTU) {
Updates.reserve(IndirectBrs.size() + 2 * IndirectBrSuccs.size());
for (auto *IBr : IndirectBrs) {
SwitchPN->addIncoming(GetSwitchValue(IBr), IBr->getParent());
- BranchInst::Create(SwitchBB, IBr);
+ BranchInst::Create(SwitchBB, IBr->getIterator());
if (DTU) {
Updates.push_back({DominatorTree::Insert, IBr->getParent(), SwitchBB});
for (BasicBlock *SuccBB : IBr->successors())
diff --git a/llvm/lib/CodeGen/InterleavedAccessPass.cpp b/llvm/lib/CodeGen/InterleavedAccessPass.cpp
index 2a0daf404c9783..438ac1c3cc6e2c 100644
--- a/llvm/lib/CodeGen/InterleavedAccessPass.cpp
+++ b/llvm/lib/CodeGen/InterleavedAccessPass.cpp
@@ -388,14 +388,15 @@ bool InterleavedAccessImpl::replaceBinOpShuffles(
return Idx < (int)cast<FixedVectorType>(BIOp0Ty)->getNumElements();
}));
+ BasicBlock::iterator insertPos = SVI->getIterator();
auto *NewSVI1 =
new ShuffleVectorInst(BI->getOperand(0), PoisonValue::get(BIOp0Ty),
- Mask, SVI->getName(), SVI);
+ Mask, SVI->getName(), insertPos);
auto *NewSVI2 = new ShuffleVectorInst(
BI->getOperand(1), PoisonValue::get(BI->getOperand(1)->getType()), Mask,
- SVI->getName(), SVI);
+ SVI->getName(), insertPos);
BinaryOperator *NewBI = BinaryOperator::CreateWithCopiedFlags(
- BI->getOpcode(), NewSVI1, NewSVI2, BI, BI->getName(), SVI);
+ BI->getOpcode(), NewSVI1, NewSVI2, BI, BI->getName(), insertPos);
SVI->replaceAllUsesWith(NewBI);
LLVM_DEBUG(dbgs() << " Replaced: " << *BI << "\n And : " << *SVI
<< "\n With : " << *NewSVI1 << "\n And : "
diff --git a/llvm/lib/CodeGen/IntrinsicLowering.cpp b/llvm/lib/CodeGen/IntrinsicLowering.cpp
index fe450cba4a3332..09d282d12c5fb1 100644
--- a/llvm/lib/CodeGen/IntrinsicLowering.cpp
+++ b/llvm/lib/CodeGen/IntrinsicLowering.cpp
@@ -472,7 +472,7 @@ bool IntrinsicLowering::LowerToByteSwap(CallInst *CI) {
Function *Int = Intrinsic::getDeclaration(M, Intrinsic::bswap, Ty);
Value *Op = CI->getArgOperand(0);
- Op = CallInst::Create(Int, Op, CI->getName(), CI);
+ Op = CallInst::Create(Int, Op, CI->getName(), CI->getIterator());
CI->replaceAllUsesWith(Op);
CI->eraseFromParent();
diff --git a/llvm/lib/CodeGen/JMCInstrumenter.cpp b/llvm/lib/CodeGen/JMCInstrumenter.cpp
index 62a38191887524..e2aaebedf5a4fd 100644
--- a/llvm/lib/CodeGen/JMCInstrumenter.cpp
+++ b/llvm/lib/CodeGen/JMCInstrumenter.cpp
@@ -227,7 +227,7 @@ bool runImpl(Module &M) {
// FIXME: it would be nice to make CI scheduling boundary, although in
// practice it does not matter much.
auto *CI = CallInst::Create(getCheckFunctionType(Ctx), CheckFunction,
- {Flag}, "", &*F.begin()->getFirstInsertionPt());
+ {Flag}, "", F.begin()->getFirstInsertionPt());
CI->addParamAttr(0, Attribute::NoUndef);
if (UseX86FastCall) {
CI->setCallingConv(CallingConv::X86_FastCall);
diff --git a/llvm/lib/CodeGen/SjLjEHPrepare.cpp b/llvm/lib/CodeGen/SjLjEHPrepare.cpp
index 515b5764a09479..af9f23ece475ce 100644
--- a/llvm/lib/CodeGen/SjLjEHPrepare.cpp
+++ b/llvm/lib/CodeGen/SjLjEHPrepare.cpp
@@ -204,7 +204,7 @@ SjLjEHPrepareImpl::setupFunctionContext(Function &F,
auto &DL = F.getParent()->getDataLayout();
const Align Alignment = DL.getPrefTypeAlign(FunctionContextTy);
FuncCtx = new AllocaInst(FunctionContextTy, DL.getAllocaAddrSpace(), nullptr,
- Alignment, "fn_context", &EntryBB->front());
+ Alignment, "fn_context", EntryBB->begin());
// Fill in the function context structure.
for (LandingPadInst *LPI : LPads) {
@@ -273,7 +273,7 @@ void SjLjEHPrepareImpl::lowerIncomingArguments(Function &F) {
Value *TrueValue = ConstantInt::getTrue(F.getContext());
Value *UndefValue = UndefValue::get(Ty);
Instruction *SI = SelectInst::Create(
- TrueValue, &AI, UndefValue, AI.getName() + ".tmp", &*AfterAllocaInsPt);
+ TrueValue, &AI, UndefValue, AI.getName() + ".tmp", AfterAllocaInsPt);
AI.replaceAllUsesWith(SI);
// Reset the operand, because it was clobbered by the RAUW above.
@@ -388,7 +388,7 @@ bool SjLjEHPrepareImpl::setupEntryBlockAndCallSites(Function &F) {
if (Function *Callee = II->getCalledFunction())
if (Callee->getIntrinsicID() == Intrinsic::donothing) {
// Remove the NOP invoke.
- BranchInst::Create(II->getNormalDest(), II);
+ BranchInst::Create(II->getNormalDest(), II->getIterator());
II->eraseFromParent();
continue;
}
@@ -447,7 +447,7 @@ bool SjLjEHPrepareImpl::setupEntryBlockAndCallSites(Function &F) {
// Record the call site value for the back end so it stays associated with
// the invoke.
- CallInst::Create(CallSiteFn, CallSiteNum, "", Invokes[I]);
+ CallInst::Create(CallSiteFn, CallSiteNum, "", Invokes[I]->getIterator());
}
// Mark call instructions that aren't nounwind as no-action (call_site ==
@@ -465,7 +465,7 @@ bool SjLjEHPrepareImpl::setupEntryBlockAndCallSites(Function &F) {
// Register the function context and make sure it's known to not throw
CallInst *Register =
- CallInst::Create(RegisterFn, FuncCtx, "", EntryBB->getTerminator());
+ CallInst::Create(RegisterFn, FuncCtx, "", EntryBB->getTerminator()->getIterator());
Register->setDoesNotThrow();
// Following any allocas not in the entry block, update the saved SP in the
@@ -482,7 +482,7 @@ bool SjLjEHPrepareImpl::setupEntryBlockAndCallSites(Function &F) {
}
Instruction *StackAddr = CallInst::Create(StackAddrFn, "sp");
StackAddr->insertAfter(&I);
- new StoreInst(StackAddr, StackPtr, true, StackAddr->getNextNode());
+ new StoreInst(StackAddr, StackPtr, true, std::next(StackAddr->getIterator()));
}
}
@@ -492,7 +492,7 @@ bool SjLjEHPrepareImpl::setupEntryBlockAndCallSites(Function &F) {
Instruction *InsertPoint = Return;
if (CallInst *CI = Return->getParent()->getTerminatingMustTailCall())
InsertPoint = CI;
- CallInst::Create(UnregisterFn, FuncCtx, "", InsertPoint);
+ CallInst::Create(UnregisterFn, FuncCtx, "", InsertPoint->getIterator());
}
return true;
diff --git a/llvm/lib/CodeGen/WinEHPrepare.cpp b/llvm/lib/CodeGen/WinEHPrepare.cpp
index 95976c218c2f14..4c09bfe90e1ed4 100644
--- a/llvm/lib/CodeGen/WinEHPrepare.cpp
+++ b/llvm/lib/CodeGen/WinEHPrepare.cpp
@@ -1234,10 +1234,10 @@ AllocaInst *WinEHPrepareImpl::insertPHILoads(PHINode *PN, Function &F) {
// that will dominate all uses.
SpillSlot = new AllocaInst(PN->getType(), DL->getAllocaAddrSpace(), nullptr,
Twine(PN->getName(), ".wineh.spillslot"),
- &F.getEntryBlock().front());
+ F.getEntryBlock().begin());
Value *V = new LoadInst(PN->getType(), SpillSlot,
Twine(PN->getName(), ".wineh.reload"),
- &*PHIBlock->getFirstInsertionPt());
+ PHIBlock->getFirstInsertionPt());
PN->replaceAllUsesWith(V);
return SpillSlot;
}
@@ -1309,7 +1309,7 @@ void WinEHPrepareImpl::insertPHIStore(
}
// Otherwise, insert the store at the end of the basic block.
- new StoreInst(PredVal, SpillSlot, PredBlock->getTerminator());
+ new StoreInst(PredVal, SpillSlot, PredBlock->getTerminator()->getIterator());
}
void WinEHPrepareImpl::replaceUseWithLoad(
@@ -1319,7 +1319,7 @@ void WinEHPrepareImpl::replaceUseWithLoad(
if (!SpillSlot)
SpillSlot = new AllocaInst(V->getType(), DL->getAllocaAddrSpace(), nullptr,
Twine(V->getName(), ".wineh.spillslot"),
- &F.getEntryBlock().front());
+ F.getEntryBlock().begin());
auto *UsingInst = cast<Instruction>(U.getUser());
if (auto *UsingPHI = dyn_cast<PHINode>(UsingInst)) {
@@ -1378,14 +1378,14 @@ void WinEHPrepareImpl::replaceUseWithLoad(
if (!Load)
Load = new LoadInst(V->getType(), SpillSlot,
Twine(V->getName(), ".wineh.reload"),
- /*isVolatile=*/false, IncomingBlock->getTerminator());
+ /*isVolatile=*/false, IncomingBlock->getTerminator()->getIterator());
U.set(Load);
} else {
// Reload right before the old use.
auto *Load = new LoadInst(V->getType(), SpillSlot,
Twine(V->getName(), ".wineh.reload"),
- /*isVolatile=*/false, UsingInst);
+ /*isVolatile=*/false, UsingInst->getIterator());
U.set(Load);
}
}
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index 4d1eb10d2d41c6..6be235c05865db 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -358,7 +358,7 @@ class TriggerVerifierErrorPass
// Intentionally break the Function by inserting a terminator
// instruction in the middle of a basic block.
BasicBlock &BB = F.getEntryBlock();
- new UnreachableInst(F.getContext(), BB.getTerminator());
+ new UnreachableInst(F.getContext(), BB.getTerminator()->getIterator());
return PreservedAnalyses::none();
}
diff --git a/llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp b/llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp
index 755b034764ed2d..7a86c5c6088120 100644
--- a/llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp
+++ b/llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp
@@ -1129,7 +1129,7 @@ static std::optional<Instruction *> instCombineSVELast(InstCombiner &IC,
auto *NewRHS =
IC.Builder.CreateIntrinsic(IntrinsicID, {Vec->getType()}, {Pg, RHS});
auto *NewBinOp = BinaryOperator::CreateWithCopiedFlags(
- OpC, NewLHS, NewRHS, OldBinOp, OldBinOp->getName(), &II);
+ OpC, NewLHS, NewRHS, OldBinOp, OldBinOp->getName(), II.getIterator());
return IC.replaceInstUsesWith(II, NewBinOp);
}
}
diff --git a/llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp b/llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp
index 2da896edc79a7f..73984f348bc465 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp
@@ -470,9 +470,9 @@ bool AMDGPULibCalls::sincosUseNative(CallInst *aCI, const FuncInfo &FInfo) {
nf.setId(AMDGPULibFunc::EI_COS);
FunctionCallee cosExpr = getFunction(M, nf);
if (sinExpr && cosExpr) {
- Value *sinval = CallInst::Create(sinExpr, opr0, "splitsin", aCI);
- Value *cosval = CallInst::Create(cosExpr, opr0, "splitcos", aCI);
- new StoreInst(cosval, aCI->getArgOperand(1), aCI);
+ Value *sinval = CallInst::Create(sinExpr, opr0, "splitsin", aCI->getIterator());
+ Value *cosval = CallInst::Create(cosExpr, opr0, "splitcos", aCI->getIterator());
+ new StoreInst(cosval, aCI->getArgOperand(1), aCI->getIterator());
DEBUG_WITH_TYPE("usenative", dbgs() << "<useNative> replace " << *aCI
<< " with native version of sin/cos");
@@ -1655,7 +1655,7 @@ bool AMDGPULibCalls::evaluateCall(CallInst *aCI, const FuncInfo &FInfo) {
// sincos
assert(FInfo.getId() == AMDGPULibFunc::EI_SINCOS &&
"math function with ptr arg not supported yet");
- new StoreInst(nval1, aCI->getArgOperand(1), aCI);
+ new StoreInst(nval1, aCI->getArgOperand(1), aCI->getIterator());
}
replaceCall(aCI, nval0);
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
index 7b5dc3795b0227..f8ee9ac5d565e5 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
@@ -291,7 +291,7 @@ bool AMDGPUPrintfRuntimeBindingImpl::lowerPrintfForGpu(Module &M) {
SmallVector<Value *, 1> alloc_args;
alloc_args.push_back(sumC);
CallInst *pcall =
- CallInst::Create(PrintfAllocFn, alloc_args, "printf_alloc_fn", CI);
+ CallInst::Create(PrintfAllocFn, alloc_args, "printf_alloc_fn", CI->getIterator());
//
// Insert code to split basicblock with a
@@ -309,25 +309,26 @@ bool AMDGPUPrintfRuntimeBindingImpl::lowerPrintfForGpu(Module &M) {
SplitBlock(CI->getParent(), cmp);
Instruction *Brnch =
SplitBlockAndInsertIfThen(cmp, cmp->getNextNode(), false);
+ BasicBlock::iterator BrnchPoint = Brnch->getIterator();
Builder.SetInsertPoint(Brnch);
// store unique printf id in the buffer
//
GetElementPtrInst *BufferIdx = GetElementPtrInst::Create(
- I8Ty, pcall, ConstantInt::get(Ctx, APInt(32, 0)), "PrintBuffID", Brnch);
+ I8Ty, pcall, ConstantInt::get(Ctx, APInt(32, 0)), "PrintBuffID", BrnchPoint);
Type *idPointer = PointerType::get(I32Ty, AMDGPUAS::GLOBAL_ADDRESS);
Value *id_gep_cast =
- new BitCastInst(BufferIdx, idPointer, "PrintBuffIdCast", Brnch);
+ new BitCastInst(BufferIdx, idPointer, "PrintBuffIdCast", BrnchPoint);
- new StoreInst(ConstantInt::get(I32Ty, UniqID), id_gep_cast, Brnch);
+ new StoreInst(ConstantInt::get(I32Ty, UniqID), id_gep_cast, BrnchPoint);
// 1st 4 bytes hold the printf_id
// the following GEP is the buffer pointer
BufferIdx = GetElementPtrInst::Create(I8Ty, pcall,
ConstantInt::get(Ctx, APInt(32, 4)),
- "PrintBuffGep", Brnch);
+ "PrintBuffGep", BrnchPoint);
Type *Int32Ty = Type::getInt32Ty(Ctx);
for (unsigned ArgCount = 1;
@@ -405,7 +406,7 @@ bool AMDGPUPrintfRuntimeBindingImpl::lowerPrintfForGpu(Module &M) {
for (unsigned I = 0, E = WhatToStore.size(); I != E; ++I) {
Value *TheBtCast = WhatToStore[I];
unsigned ArgSize = TD->getTypeAllocSize(TheBtCast->getType());
- StoreInst *StBuff = new StoreInst(TheBtCast, BufferIdx, Brnch);
+ StoreInst *StBuff = new StoreInst(TheBtCast, BufferIdx, BrnchPoint);
LLVM_DEBUG(dbgs() << "inserting store to printf buffer:\n"
<< *StBuff << '\n');
(void)StBuff;
@@ -413,7 +414,7 @@ bool AMDGPUPrintfRuntimeBindingImpl::lowerPrintfForGpu(Module &M) {
break;
BufferIdx = GetElementPtrInst::Create(
I8Ty, BufferIdx, {ConstantInt::get(I32Ty, ArgSize)},
- "PrintBuffNextPtr", Brnch);
+ "PrintBuffNextPtr", BrnchPoint);
LLVM_DEBUG(dbgs() << "inserting gep to the printf buffer:\n"
<< *BufferIdx << '\n');
}
diff --git a/llvm/lib/Target/ARM/MVEGatherScatterLowering.cpp b/llvm/lib/Target/ARM/MVEGatherScatterLowering.cpp
index 404c280ab97991..6ec7a0fb51d10d 100644
--- a/llvm/lib/Target/ARM/MVEGatherScatterLowering.cpp
+++ b/llvm/lib/Target/ARM/MVEGatherScatterLowering.cpp
@@ -781,7 +781,7 @@ Instruction *MVEGatherScatterLowering::tryCreateIncrementingGatScat(
Instruction *ScaledOffsets = BinaryOperator::Create(
Instruction::Shl, OffsetsIncoming,
Builder.CreateVectorSplat(Ty->getNumElements(), Builder.getInt32(TypeScale)),
- "ScaledIndex", I);
+ "ScaledIndex", I->getIterator());
// Add the base to the offsets
OffsetsIncoming = BinaryOperator::Create(
Instruction::Add, ScaledOffsets,
@@ -790,7 +790,7 @@ Instruction *MVEGatherScatterLowering::tryCreateIncrementingGatScat(
Builder.CreatePtrToInt(
BasePtr,
cast<VectorType>(ScaledOffsets->getType())->getElementType())),
- "StartIndex", I);
+ "StartIndex", I->getIterator());
if (I->getIntrinsicID() == Intrinsic::masked_gather)
return tryCreateMaskedGatherBase(I, OffsetsIncoming, Builder, Immediate);
@@ -838,7 +838,7 @@ Instruction *MVEGatherScatterLowering::tryCreateIncrementingWBGatScat(
Instruction *ScaledOffsets = BinaryOperator::Create(
Instruction::Shl, Phi->getIncomingValue(1 - IncrementIndex),
Builder.CreateVectorSplat(NumElems, Builder.getInt32(TypeScale)),
- "ScaledIndex", &Phi->getIncomingBlock(1 - IncrementIndex)->back());
+ "ScaledIndex", Phi->getIncomingBlock(1 - IncrementIndex)->back().getIterator());
// Add the base to the offsets
OffsetsIncoming = BinaryOperator::Create(
Instruction::Add, ScaledOffsets,
@@ -847,13 +847,13 @@ Instruction *MVEGatherScatterLowering::tryCreateIncrementingWBGatScat(
Builder.CreatePtrToInt(
BasePtr,
cast<VectorType>(ScaledOffsets->getType())->getElementType())),
- "StartIndex", &Phi->getIncomingBlock(1 - IncrementIndex)->back());
+ "StartIndex", Phi->getIncomingBlock(1 - IncrementIndex)->back().getIterator());
// The gather is pre-incrementing
OffsetsIncoming = BinaryOperator::Create(
Instruction::Sub, OffsetsIncoming,
Builder.CreateVectorSplat(NumElems, Builder.getInt32(Immediate)),
"PreIncrementStartIndex",
- &Phi->getIncomingBlock(1 - IncrementIndex)->back());
+ Phi->getIncomingBlock(1 - IncrementIndex)->back().getIterator());
Phi->setIncomingValue(1 - IncrementIndex, OffsetsIncoming);
Builder.SetInsertPoint(I);
@@ -886,8 +886,8 @@ void MVEGatherScatterLowering::pushOutAdd(PHINode *&Phi,
Value *OffsSecondOperand,
unsigned StartIndex) {
LLVM_DEBUG(dbgs() << "masked gathers/scatters: optimising add instruction\n");
- Instruction *InsertionPoint =
- &cast<Instruction>(Phi->getIncomingBlock(StartIndex)->back());
+ BasicBlock::iterator InsertionPoint =
+ Phi->getIncomingBlock(StartIndex)->back().getIterator();
// Initialize the phi with a vector that contains a sum of the constants
Instruction *NewIndex = BinaryOperator::Create(
Instruction::Add, Phi->getIncomingValue(StartIndex), OffsSecondOperand,
@@ -911,8 +911,8 @@ void MVEGatherScatterLowering::pushOutMulShl(unsigned Opcode, PHINode *&Phi,
// Create a new scalar add outside of the loop and transform it to a splat
// by which loop variable can be incremented
- Instruction *InsertionPoint = &cast<Instruction>(
- Phi->getIncomingBlock(LoopIncrement == 1 ? 0 : 1)->back());
+ BasicBlock::iterator InsertionPoint =
+ Phi->getIncomingBlock(LoopIncrement == 1 ? 0 : 1)->back().getIterator();
// Create a new index
Value *StartIndex =
@@ -923,11 +923,15 @@ void MVEGatherScatterLowering::pushOutMulShl(unsigned Opcode, PHINode *&Phi,
Instruction *Product =
BinaryOperator::Create((Instruction::BinaryOps)Opcode, IncrementPerRound,
OffsSecondOperand, "Product", InsertionPoint);
+
+ BasicBlock::iterator NewIncrInsertPt =
+ Phi->getIncomingBlock(LoopIncrement)->back().getIterator();
+ NewIncrInsertPt = std::prev(NewIncrInsertPt);
+
// Increment NewIndex by Product instead of the multiplication
Instruction *NewIncrement = BinaryOperator::Create(
Instruction::Add, Phi, Product, "IncrementPushedOutMul",
- cast<Instruction>(Phi->getIncomingBlock(LoopIncrement)->back())
- .getPrevNode());
+ NewIncrInsertPt);
Phi->addIncoming(StartIndex,
Phi->getIncomingBlock(LoopIncrement == 1 ? 0 : 1));
@@ -1054,7 +1058,7 @@ bool MVEGatherScatterLowering::optimiseOffsets(Value *Offsets, BasicBlock *BB,
// our phi, we need to copy it
IncInstruction = BinaryOperator::Create(
Instruction::BinaryOps(IncInstruction->getOpcode()), Phi,
- IncrementPerRound, "LoopIncrement", IncInstruction);
+ IncrementPerRound, "LoopIncrement", IncInstruction->getIterator());
Phi->setIncomingValue(IncrementingBlock, IncInstruction);
}
NewPhi = Phi;
@@ -1066,7 +1070,7 @@ bool MVEGatherScatterLowering::optimiseOffsets(Value *Offsets, BasicBlock *BB,
Phi->getIncomingBlock(IncrementingBlock == 1 ? 0 : 1));
IncInstruction = BinaryOperator::Create(
Instruction::BinaryOps(IncInstruction->getOpcode()), NewPhi,
- IncrementPerRound, "LoopIncrement", IncInstruction);
+ IncrementPerRound, "LoopIncrement", IncInstruction->getIterator());
NewPhi->addIncoming(IncInstruction,
Phi->getIncomingBlock(IncrementingBlock));
IncrementingBlock = 1;
@@ -1229,7 +1233,7 @@ bool MVEGatherScatterLowering::optimiseAddress(Value *Address, BasicBlock *BB,
BaseTy = FixedVectorType::get(BaseTy, VecTy);
GetElementPtrInst *NewAddress = GetElementPtrInst::Create(
Builder.getInt8Ty(), Builder.CreateBitCast(Base, BaseTy), Offsets,
- "gep.merged", GEP);
+ "gep.merged", GEP->getIterator());
LLVM_DEBUG(dbgs() << "Folded GEP: " << *GEP
<< "\n new : " << *NewAddress << "\n");
GEP->replaceAllUsesWith(
diff --git a/llvm/lib/Target/BPF/BPFAbstractMemberAccess.cpp b/llvm/lib/Target/BPF/BPFAbstractMemberAccess.cpp
index f2d1206d02316a..ce1895bde5d9c3 100644
--- a/llvm/lib/Target/BPF/BPFAbstractMemberAccess.cpp
+++ b/llvm/lib/Target/BPF/BPFAbstractMemberAccess.cpp
@@ -427,7 +427,7 @@ static void replaceWithGEP(CallInst *Call, uint32_t DimensionIndex,
IdxList.push_back(Call->getArgOperand(GEPIndex));
auto *GEP = GetElementPtrInst::CreateInBounds(
- getBaseElementType(Call), Call->getArgOperand(0), IdxList, "", Call);
+ getBaseElementType(Call), Call->getArgOperand(0), IdxList, "", Call->getIterator());
Call->replaceAllUsesWith(GEP);
Call->eraseFromParent();
}
@@ -1091,9 +1091,9 @@ bool BPFAbstractMemberAccess::transformGEPChain(CallInst *Call,
// Load the global variable which represents the returned field info.
LoadInst *LDInst;
if (IsInt32Ret)
- LDInst = new LoadInst(Type::getInt32Ty(BB->getContext()), GV, "", Call);
+ LDInst = new LoadInst(Type::getInt32Ty(BB->getContext()), GV, "", Call->getIterator());
else
- LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+ LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
Instruction *PassThroughInst =
BPFCoreSharedInfo::insertPassThrough(M, BB, LDInst, Call);
@@ -1113,7 +1113,7 @@ bool BPFAbstractMemberAccess::transformGEPChain(CallInst *Call,
// The original Call inst is removed.
// Load the global variable.
- auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+ auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
// Generate a BitCast
auto *BCInst =
diff --git a/llvm/lib/Target/BPF/BPFPreserveDIType.cpp b/llvm/lib/Target/BPF/BPFPreserveDIType.cpp
index dae1aeea352189..819083096150bf 100644
--- a/llvm/lib/Target/BPF/BPFPreserveDIType.cpp
+++ b/llvm/lib/Target/BPF/BPFPreserveDIType.cpp
@@ -117,7 +117,7 @@ static bool BPFPreserveDITypeImpl(Function &F) {
// Load the global variable which represents the type info.
auto *LDInst =
- new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call);
+ new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
Instruction *PassThroughInst =
BPFCoreSharedInfo::insertPassThrough(M, BB, LDInst, Call);
Call->replaceAllUsesWith(PassThroughInst);
diff --git a/llvm/lib/Target/Hexagon/HexagonCommonGEP.cpp b/llvm/lib/Target/Hexagon/HexagonCommonGEP.cpp
index 5ad749074a8e29..1ac581690b02c4 100644
--- a/llvm/lib/Target/Hexagon/HexagonCommonGEP.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonCommonGEP.cpp
@@ -1109,7 +1109,7 @@ Value *HexagonCommonGEP::fabricateGEP(NodeVect &NA, BasicBlock::iterator At,
break;
}
}
- NewInst = GetElementPtrInst::Create(InpTy, Input, IdxList, "cgep", &*At);
+ NewInst = GetElementPtrInst::Create(InpTy, Input, IdxList, "cgep", At);
NewInst->setIsInBounds(RN->Flags & GepNode::InBounds);
LLVM_DEBUG(dbgs() << "new GEP: " << *NewInst << '\n');
if (Idx < Num) {
diff --git a/llvm/lib/Target/Mips/Mips16HardFloat.cpp b/llvm/lib/Target/Mips/Mips16HardFloat.cpp
index 5c96044b1f0b85..f7b623785b70c2 100644
--- a/llvm/lib/Target/Mips/Mips16HardFloat.cpp
+++ b/llvm/lib/Target/Mips/Mips16HardFloat.cpp
@@ -414,7 +414,7 @@ static bool fixupFPReturnAndCall(Function &F, Module *M,
C, Attribute::getWithMemoryEffects(C, MemoryEffects::none()));
A = A.addFnAttribute(C, Attribute::NoInline);
FunctionCallee F = (M->getOrInsertFunction(Name, A, MyVoid, T));
- CallInst::Create(F, Params, "", &I);
+ CallInst::Create(F, Params, "", I.getIterator());
} else if (const CallInst *CI = dyn_cast<CallInst>(&I)) {
FunctionType *FT = CI->getFunctionType();
Function *F_ = CI->getCalledFunction();
diff --git a/llvm/lib/Target/NVPTX/NVPTXImageOptimizer.cpp b/llvm/lib/Target/NVPTX/NVPTXImageOptimizer.cpp
index 202134ed7035aa..c3fce14df06884 100644
--- a/llvm/lib/Target/NVPTX/NVPTXImageOptimizer.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXImageOptimizer.cpp
@@ -157,7 +157,7 @@ void NVPTXImageOptimizer::replaceWith(Instruction *From, ConstantInt *To) {
else
// Get true block
Dest = BI->getSuccessor(0);
- BranchInst::Create(Dest, BI);
+ BranchInst::Create(Dest, BI->getIterator());
InstrToDelete.push_back(BI);
}
}
diff --git a/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp b/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp
index 9e06f4689304ba..19a587c46666c4 100644
--- a/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp
@@ -185,14 +185,14 @@ static void convertToParamAS(Value *OldUser, Value *Param) {
SmallVector<Value *, 4> Indices(GEP->indices());
auto *NewGEP = GetElementPtrInst::Create(GEP->getSourceElementType(),
I.NewParam, Indices,
- GEP->getName(), GEP);
+ GEP->getName(), GEP->getIterator());
NewGEP->setIsInBounds(GEP->isInBounds());
return NewGEP;
}
if (auto *BC = dyn_cast<BitCastInst>(I.OldInstruction)) {
auto *NewBCType = PointerType::get(BC->getContext(), ADDRESS_SPACE_PARAM);
return BitCastInst::Create(BC->getOpcode(), I.NewParam, NewBCType,
- BC->getName(), BC);
+ BC->getName(), BC->getIterator());
}
if (auto *ASC = dyn_cast<AddrSpaceCastInst>(I.OldInstruction)) {
assert(ASC->getDestAddressSpace() == ADDRESS_SPACE_PARAM);
@@ -316,7 +316,7 @@ static void adjustByValArgAlignment(Argument *Arg, Value *ArgInParamAS,
void NVPTXLowerArgs::handleByValParam(const NVPTXTargetMachine &TM,
Argument *Arg) {
Function *Func = Arg->getParent();
- Instruction *FirstInst = &(Func->getEntryBlock().front());
+ BasicBlock::iterator FirstInst = Func->getEntryBlock().begin();
Type *StructType = Arg->getParamByValType();
assert(StructType && "Missing byval type");
@@ -407,9 +407,9 @@ void NVPTXLowerArgs::markPointerAsGlobal(Value *Ptr) {
Instruction *PtrInGlobal = new AddrSpaceCastInst(
Ptr, PointerType::get(Ptr->getContext(), ADDRESS_SPACE_GLOBAL),
- Ptr->getName(), &*InsertPt);
+ Ptr->getName(), InsertPt);
Value *PtrInGeneric = new AddrSpaceCastInst(PtrInGlobal, Ptr->getType(),
- Ptr->getName(), &*InsertPt);
+ Ptr->getName(), InsertPt);
// Replace with PtrInGeneric all uses of Ptr except PtrInGlobal.
Ptr->replaceAllUsesWith(PtrInGeneric);
PtrInGlobal->setOperand(0, Ptr);
diff --git a/llvm/lib/Target/NVPTX/NVPTXLowerUnreachable.cpp b/llvm/lib/Target/NVPTX/NVPTXLowerUnreachable.cpp
index 34f06b548db260..92b90e2559154e 100644
--- a/llvm/lib/Target/NVPTX/NVPTXLowerUnreachable.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXLowerUnreachable.cpp
@@ -143,7 +143,7 @@ bool NVPTXLowerUnreachable::runOnFunction(Function &F) {
if (auto unreachableInst = dyn_cast<UnreachableInst>(&I)) {
if (isLoweredToTrap(*unreachableInst))
continue; // trap is emitted as `trap; exit;`.
- CallInst::Create(ExitFTy, Exit, "", unreachableInst);
+ CallInst::Create(ExitFTy, Exit, "", unreachableInst->getIterator());
Changed = true;
}
}
diff --git a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
index f1abb78d4dd343..ca1137a8f77d8b 100644
--- a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
+++ b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
@@ -263,7 +263,7 @@ class PPCBoolRetToInt : public FunctionPass {
Value *IntRetVal = BoolToIntMap[U];
Type *Int1Ty = Type::getInt1Ty(U->getContext());
auto *I = cast<Instruction>(U.getUser());
- Value *BackToBool = new TruncInst(IntRetVal, Int1Ty, "backToBool", I);
+ Value *BackToBool = new TruncInst(IntRetVal, Int1Ty, "backToBool", I->getIterator());
U.set(BackToBool);
return true;
diff --git a/llvm/lib/Target/PowerPC/PPCLoopInstrFormPrep.cpp b/llvm/lib/Target/PowerPC/PPCLoopInstrFormPrep.cpp
index dc739a2c7a4d0a..6e2d51899cda90 100644
--- a/llvm/lib/Target/PowerPC/PPCLoopInstrFormPrep.cpp
+++ b/llvm/lib/Target/PowerPC/PPCLoopInstrFormPrep.cpp
@@ -725,7 +725,7 @@ PPCLoopInstrFormPrep::rewriteForBase(Loop *L, const SCEVAddRecExpr *BasePtrSCEV,
Instruction *PtrInc = nullptr;
Instruction *NewBasePtr = nullptr;
if (CanPreInc) {
- Instruction *InsPoint = &*Header->getFirstInsertionPt();
+ BasicBlock::iterator InsPoint = Header->getFirstInsertionPt();
PtrInc = GetElementPtrInst::Create(
I8Ty, NewPHI, IncNode, getInstrName(BaseMemI, GEPNodeIncNameSuffix),
InsPoint);
@@ -752,7 +752,7 @@ PPCLoopInstrFormPrep::rewriteForBase(Loop *L, const SCEVAddRecExpr *BasePtrSCEV,
// For the latch predecessor, we need to insert a GEP just before the
// terminator to increase the address.
BasicBlock *BB = PI;
- Instruction *InsPoint = BB->getTerminator();
+ BasicBlock::iterator InsPoint = BB->getTerminator()->getIterator();
PtrInc = GetElementPtrInst::Create(
I8Ty, NewPHI, IncNode, getInstrName(BaseMemI, GEPNodeIncNameSuffix),
InsPoint);
@@ -764,7 +764,7 @@ PPCLoopInstrFormPrep::rewriteForBase(Loop *L, const SCEVAddRecExpr *BasePtrSCEV,
if (NewPHI->getType() != BasePtr->getType())
NewBasePtr = new BitCastInst(NewPHI, BasePtr->getType(),
getInstrName(NewPHI, CastNodeNameSuffix),
- &*Header->getFirstInsertionPt());
+ Header->getFirstInsertionPt());
else
NewBasePtr = NewPHI;
}
@@ -794,20 +794,26 @@ Instruction *PPCLoopInstrFormPrep::rewriteForBucketElement(
cast<SCEVConstant>(Element.Offset)->getValue()->isZero())) {
RealNewPtr = NewBasePtr;
} else {
- Instruction *PtrIP = dyn_cast<Instruction>(Ptr);
+ std::optional<BasicBlock::iterator> PtrIP = std::nullopt;
+ if (Instruction *I = dyn_cast<Instruction>(Ptr))
+ PtrIP = I->getIterator();
+
if (PtrIP && isa<Instruction>(NewBasePtr) &&
- cast<Instruction>(NewBasePtr)->getParent() == PtrIP->getParent())
- PtrIP = nullptr;
- else if (PtrIP && isa<PHINode>(PtrIP))
- PtrIP = &*PtrIP->getParent()->getFirstInsertionPt();
+ cast<Instruction>(NewBasePtr)->getParent() == (*PtrIP)->getParent())
+ PtrIP = std::nullopt;
+ else if (PtrIP && isa<PHINode>(*PtrIP))
+ PtrIP = (*PtrIP)->getParent()->getFirstInsertionPt();
else if (!PtrIP)
- PtrIP = Element.Instr;
+ PtrIP = Element.Instr->getIterator();
assert(OffToBase && "There should be an offset for non base element!\n");
- GetElementPtrInst *NewPtr = GetElementPtrInst::Create(
+ GetElementPtrInst *NewPtr =
+ GetElementPtrInst::Create(
I8Ty, PtrInc, OffToBase,
- getInstrName(Element.Instr, GEPNodeOffNameSuffix), PtrIP);
- if (!PtrIP)
+ getInstrName(Element.Instr, GEPNodeOffNameSuffix));
+ if (PtrIP)
+ NewPtr->insertBefore(*(*PtrIP)->getParent(), *PtrIP);
+ else
NewPtr->insertAfter(cast<Instruction>(PtrInc));
NewPtr->setIsInBounds(IsPtrInBounds(Ptr));
RealNewPtr = NewPtr;
diff --git a/llvm/lib/Target/RISCV/RISCVGatherScatterLowering.cpp b/llvm/lib/Target/RISCV/RISCVGatherScatterLowering.cpp
index 0530e3d08be821..f0bd25f167d80d 100644
--- a/llvm/lib/Target/RISCV/RISCVGatherScatterLowering.cpp
+++ b/llvm/lib/Target/RISCV/RISCVGatherScatterLowering.cpp
@@ -231,7 +231,7 @@ bool RISCVGatherScatterLowering::matchStridedRecurrence(Value *Index, Loop *L,
BasePtr =
PHINode::Create(Start->getType(), 2, Phi->getName() + ".scalar", Phi->getIterator());
Inc = BinaryOperator::CreateAdd(BasePtr, Step, Inc->getName() + ".scalar",
- Inc);
+ Inc->getIterator());
BasePtr->addIncoming(Start, Phi->getIncomingBlock(1 - IncrementingBlock));
BasePtr->addIncoming(Inc, Phi->getIncomingBlock(IncrementingBlock));
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp
index 77e6640d5a8224..e84f320a280301 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp
@@ -1285,7 +1285,7 @@ bool WebAssemblyLowerEmscriptenEHSjLj::runSjLjOnFunction(Function &F) {
BinaryOperator *SetjmpTableSize =
BinaryOperator::Create(Instruction::Add, IRB.getInt32(4), IRB.getInt32(0),
- "setjmpTableSize", Entry->getTerminator());
+ "setjmpTableSize", Entry->getTerminator()->getIterator());
SetjmpTableSize->setDebugLoc(FirstDL);
// setjmpTable = (int *) malloc(40);
Type *IntPtrTy = getAddrIntType(&M);
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyLowerRefTypesIntPtrConv.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyLowerRefTypesIntPtrConv.cpp
index e0a21921122858..2594430d1d8f3a 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyLowerRefTypesIntPtrConv.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyLowerRefTypesIntPtrConv.cpp
@@ -73,7 +73,7 @@ bool WebAssemblyLowerRefTypesIntPtrConv::runOnFunction(Function &F) {
Function *TrapIntrin =
Intrinsic::getDeclaration(F.getParent(), Intrinsic::debugtrap);
- CallInst::Create(TrapIntrin, {}, "", &*I);
+ CallInst::Create(TrapIntrin, {}, "", I->getIterator());
worklist.insert(&*I);
}
diff --git a/llvm/lib/Target/X86/X86LowerAMXType.cpp b/llvm/lib/Target/X86/X86LowerAMXType.cpp
index a57c0fe1578840..b69058787a4e25 100644
--- a/llvm/lib/Target/X86/X86LowerAMXType.cpp
+++ b/llvm/lib/Target/X86/X86LowerAMXType.cpp
@@ -102,7 +102,7 @@ static AllocaInst *createAllocaInstAtEntry(IRBuilder<> &Builder, BasicBlock *BB,
auto AllocaAlignment = DL.getPrefTypeAlign(Type::getX86_AMXTy(Ctx));
unsigned AllocaAS = DL.getAllocaAddrSpace();
AllocaInst *AllocaRes =
- new AllocaInst(Ty, AllocaAS, "", &F.getEntryBlock().front());
+ new AllocaInst(Ty, AllocaAS, "", F.getEntryBlock().begin());
AllocaRes->setAlignment(AllocaAlignment);
return AllocaRes;
}
@@ -453,7 +453,7 @@ static Value *getAllocaPos(BasicBlock *BB) {
unsigned AllocaAS = DL.getAllocaAddrSpace();
Type *V256I32Ty = VectorType::get(Builder.getInt32Ty(), 256, false);
AllocaInst *AllocaRes =
- new AllocaInst(V256I32Ty, AllocaAS, "", &F->getEntryBlock().front());
+ new AllocaInst(V256I32Ty, AllocaAS, "", F->getEntryBlock().begin());
BasicBlock::iterator Iter = AllocaRes->getIterator();
++Iter;
Builder.SetInsertPoint(&*Iter);
diff --git a/polly/lib/CodeGen/IslNodeBuilder.cpp b/polly/lib/CodeGen/IslNodeBuilder.cpp
index a226cc2a1b2506..d48e3fee0f725e 100644
--- a/polly/lib/CodeGen/IslNodeBuilder.cpp
+++ b/polly/lib/CodeGen/IslNodeBuilder.cpp
@@ -1212,7 +1212,7 @@ bool IslNodeBuilder::preloadInvariantEquivClass(
BasicBlock *EntryBB = &Builder.GetInsertBlock()->getParent()->getEntryBlock();
auto *Alloca = new AllocaInst(AccInstTy, DL.getAllocaAddrSpace(),
AccInst->getName() + ".preload.s2a",
- &*EntryBB->getFirstInsertionPt());
+ EntryBB->getFirstInsertionPt());
Builder.CreateStore(PreloadVal, Alloca);
ValueMapT PreloadedPointer;
PreloadedPointer[PreloadVal] = AccInst;
@@ -1308,10 +1308,10 @@ void IslNodeBuilder::allocateNewArrays(BBPair StartExitBlocks) {
auto InstIt = Builder.GetInsertBlock()
->getParent()
->getEntryBlock()
- .getTerminator();
+ .getTerminator()->getIterator();
auto *CreatedArray = new AllocaInst(NewArrayType, DL.getAllocaAddrSpace(),
- SAI->getName(), &*InstIt);
+ SAI->getName(), InstIt);
if (PollyTargetFirstLevelCacheLineSize)
CreatedArray->setAlignment(Align(PollyTargetFirstLevelCacheLineSize));
SAI->setBasePtr(CreatedArray);
diff --git a/polly/lib/CodeGen/LoopGenerators.cpp b/polly/lib/CodeGen/LoopGenerators.cpp
index 5c99515c544405..b4f8bb8948c282 100644
--- a/polly/lib/CodeGen/LoopGenerators.cpp
+++ b/polly/lib/CodeGen/LoopGenerators.cpp
@@ -225,7 +225,7 @@ ParallelLoopGenerator::storeValuesIntoStruct(SetVector<Value *> &Values) {
// in the entry block of the function and use annotations to denote the actual
// live span (similar to clang).
BasicBlock &EntryBB = Builder.GetInsertBlock()->getParent()->getEntryBlock();
- Instruction *IP = &*EntryBB.getFirstInsertionPt();
+ BasicBlock::iterator IP = EntryBB.getFirstInsertionPt();
StructType *Ty = StructType::get(Builder.getContext(), Members);
AllocaInst *Struct = new AllocaInst(Ty, DL.getAllocaAddrSpace(), nullptr,
"polly.par.userContext", IP);
diff --git a/polly/lib/Support/ScopHelper.cpp b/polly/lib/Support/ScopHelper.cpp
index afdb61f25b6c12..6afe91a27b2f4d 100644
--- a/polly/lib/Support/ScopHelper.cpp
+++ b/polly/lib/Support/ScopHelper.cpp
@@ -329,7 +329,7 @@ struct ScopExpander final : SCEVVisitor<ScopExpander, const SCEV *> {
Value *RHS = expandCodeFor(RHSScev, E->getType(), IP);
Inst = BinaryOperator::Create((Instruction::BinaryOps)Inst->getOpcode(),
- LHS, RHS, Inst->getName() + Name, IP);
+ LHS, RHS, Inst->getName() + Name, IP->getIterator());
return SE.getSCEV(Inst);
}
>From 65432284adcdb40ff720a46b48b629a754d14826 Mon Sep 17 00:00:00 2001
From: Stephen Tozer <stephen.tozer at sony.com>
Date: Tue, 19 Mar 2024 15:51:07 +0000
Subject: [PATCH 2/2] clang-format
---
llvm/lib/Analysis/PHITransAddr.cpp | 9 +++++----
llvm/lib/CodeGen/CodeGenPrepare.cpp | 20 +++++++++----------
llvm/lib/CodeGen/DwarfEHPrepare.cpp | 3 ++-
llvm/lib/CodeGen/GCRootLowering.cpp | 7 ++++---
llvm/lib/CodeGen/IndirectBrExpandPass.cpp | 7 ++++---
llvm/lib/CodeGen/SjLjEHPrepare.cpp | 7 ++++---
llvm/lib/CodeGen/WinEHPrepare.cpp | 6 +++---
llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp | 6 ++++--
.../AMDGPU/AMDGPUPrintfRuntimeBinding.cpp | 7 ++++---
.../Target/ARM/MVEGatherScatterLowering.cpp | 16 ++++++++-------
.../Target/BPF/BPFAbstractMemberAccess.cpp | 14 ++++++++-----
llvm/lib/Target/BPF/BPFPreserveDIType.cpp | 4 ++--
llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp | 6 +++---
llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp | 3 ++-
.../Target/PowerPC/PPCLoopInstrFormPrep.cpp | 3 +--
.../WebAssemblyLowerEmscriptenEHSjLj.cpp | 6 +++---
polly/lib/CodeGen/IslNodeBuilder.cpp | 3 ++-
polly/lib/Support/ScopHelper.cpp | 5 +++--
18 files changed, 74 insertions(+), 58 deletions(-)
diff --git a/llvm/lib/Analysis/PHITransAddr.cpp b/llvm/lib/Analysis/PHITransAddr.cpp
index 12379e61d2422a..d16dec0d42927d 100644
--- a/llvm/lib/Analysis/PHITransAddr.cpp
+++ b/llvm/lib/Analysis/PHITransAddr.cpp
@@ -387,7 +387,8 @@ Value *PHITransAddr::insertTranslatedSubExpr(
GetElementPtrInst *Result = GetElementPtrInst::Create(
GEP->getSourceElementType(), GEPOps[0], ArrayRef(GEPOps).slice(1),
- InVal->getName() + ".phi.trans.insert", PredBB->getTerminator()->getIterator());
+ InVal->getName() + ".phi.trans.insert",
+ PredBB->getTerminator()->getIterator());
Result->setDebugLoc(Inst->getDebugLoc());
Result->setIsInBounds(GEP->isInBounds());
NewInsts.push_back(Result);
@@ -408,9 +409,9 @@ Value *PHITransAddr::insertTranslatedSubExpr(
if (OpVal == nullptr)
return nullptr;
- BinaryOperator *Res = BinaryOperator::CreateAdd(OpVal, Inst->getOperand(1),
- InVal->getName()+".phi.trans.insert",
- PredBB->getTerminator()->getIterator());
+ BinaryOperator *Res = BinaryOperator::CreateAdd(
+ OpVal, Inst->getOperand(1), InVal->getName() + ".phi.trans.insert",
+ PredBB->getTerminator()->getIterator());
Res->setHasNoSignedWrap(cast<BinaryOperator>(Inst)->hasNoSignedWrap());
Res->setHasNoUnsignedWrap(cast<BinaryOperator>(Inst)->hasNoUnsignedWrap());
NewInsts.push_back(Res);
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index 1033462d0e25ba..1795675153bfc6 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -2021,9 +2021,9 @@ static bool sinkAndCmp0Expression(Instruction *AndI, const TargetLowering &TLI,
// Keep the 'and' in the same place if the use is already in the same block.
Instruction *InsertPt =
User->getParent() == AndI->getParent() ? AndI : User;
- Instruction *InsertedAnd =
- BinaryOperator::Create(Instruction::And, AndI->getOperand(0),
- AndI->getOperand(1), "", InsertPt->getIterator());
+ Instruction *InsertedAnd = BinaryOperator::Create(
+ Instruction::And, AndI->getOperand(0), AndI->getOperand(1), "",
+ InsertPt->getIterator());
// Propagate the debug info.
InsertedAnd->setDebugLoc(AndI->getDebugLoc());
@@ -4117,9 +4117,10 @@ class AddressingModeCombiner {
if (SelectInst *CurrentSelect = dyn_cast<SelectInst>(Current)) {
// Is it OK to get metadata from OrigSelect?!
// Create a Select placeholder with dummy value.
- SelectInst *Select = SelectInst::Create(
- CurrentSelect->getCondition(), Dummy, Dummy,
- CurrentSelect->getName(), CurrentSelect->getIterator(), CurrentSelect);
+ SelectInst *Select =
+ SelectInst::Create(CurrentSelect->getCondition(), Dummy, Dummy,
+ CurrentSelect->getName(),
+ CurrentSelect->getIterator(), CurrentSelect);
Map[Current] = Select;
ST.insertNewSelect(Select);
// We are interested in True and False values.
@@ -6431,8 +6432,7 @@ bool CodeGenPrepare::optimizePhiType(
DeletedInstrs.insert(D);
} else {
BasicBlock::iterator insertPt = std::next(D->getIterator());
- ValMap[D] =
- new BitCastInst(D, ConvertTy, D->getName() + ".bc", insertPt);
+ ValMap[D] = new BitCastInst(D, ConvertTy, D->getName() + ".bc", insertPt);
}
}
for (PHINode *Phi : PhiNodes)
@@ -6452,8 +6452,8 @@ bool CodeGenPrepare::optimizePhiType(
DeletedInstrs.insert(U);
replaceAllUsesWith(U, ValMap[U->getOperand(0)], FreshBBs, IsHugeFunc);
} else {
- U->setOperand(0,
- new BitCastInst(ValMap[U->getOperand(0)], PhiTy, "bc", U->getIterator()));
+ U->setOperand(0, new BitCastInst(ValMap[U->getOperand(0)], PhiTy, "bc",
+ U->getIterator()));
}
}
diff --git a/llvm/lib/CodeGen/DwarfEHPrepare.cpp b/llvm/lib/CodeGen/DwarfEHPrepare.cpp
index 654458d3b19d11..09e7cfb12bdbad 100644
--- a/llvm/lib/CodeGen/DwarfEHPrepare.cpp
+++ b/llvm/lib/CodeGen/DwarfEHPrepare.cpp
@@ -111,7 +111,8 @@ Value *DwarfEHPrepare::GetExceptionObject(ResumeInst *RI) {
}
if (!ExnObj)
- ExnObj = ExtractValueInst::Create(RI->getOperand(0), 0, "exn.obj", RI->getIterator());
+ ExnObj = ExtractValueInst::Create(RI->getOperand(0), 0, "exn.obj",
+ RI->getIterator());
RI->eraseFromParent();
diff --git a/llvm/lib/CodeGen/GCRootLowering.cpp b/llvm/lib/CodeGen/GCRootLowering.cpp
index 0d2e0709c0696d..4fbfc0976f7bbd 100644
--- a/llvm/lib/CodeGen/GCRootLowering.cpp
+++ b/llvm/lib/CodeGen/GCRootLowering.cpp
@@ -213,8 +213,8 @@ bool DoLowering(Function &F, GCStrategy &S) {
default: break;
case Intrinsic::gcwrite: {
// Replace a write barrier with a simple store.
- Value *St = new StoreInst(CI->getArgOperand(0),
- CI->getArgOperand(2), CI->getIterator());
+ Value *St = new StoreInst(CI->getArgOperand(0), CI->getArgOperand(2),
+ CI->getIterator());
CI->replaceAllUsesWith(St);
CI->eraseFromParent();
MadeChange = true;
@@ -222,7 +222,8 @@ bool DoLowering(Function &F, GCStrategy &S) {
}
case Intrinsic::gcread: {
// Replace a read barrier with a simple load.
- Value *Ld = new LoadInst(CI->getType(), CI->getArgOperand(1), "", CI->getIterator());
+ Value *Ld = new LoadInst(CI->getType(), CI->getArgOperand(1), "",
+ CI->getIterator());
Ld->takeName(CI);
CI->replaceAllUsesWith(Ld);
CI->eraseFromParent();
diff --git a/llvm/lib/CodeGen/IndirectBrExpandPass.cpp b/llvm/lib/CodeGen/IndirectBrExpandPass.cpp
index 3c6c2db8bbe3c6..13f595bef8eeb8 100644
--- a/llvm/lib/CodeGen/IndirectBrExpandPass.cpp
+++ b/llvm/lib/CodeGen/IndirectBrExpandPass.cpp
@@ -207,9 +207,10 @@ bool runImpl(Function &F, const TargetLowering *TLI, DomTreeUpdater *DTU) {
}
auto GetSwitchValue = [CommonITy](IndirectBrInst *IBr) {
- return CastInst::CreatePointerCast(
- IBr->getAddress(), CommonITy,
- Twine(IBr->getAddress()->getName()) + ".switch_cast", IBr->getIterator());
+ return CastInst::CreatePointerCast(IBr->getAddress(), CommonITy,
+ Twine(IBr->getAddress()->getName()) +
+ ".switch_cast",
+ IBr->getIterator());
};
SmallVector<DominatorTree::UpdateType, 8> Updates;
diff --git a/llvm/lib/CodeGen/SjLjEHPrepare.cpp b/llvm/lib/CodeGen/SjLjEHPrepare.cpp
index af9f23ece475ce..5ddc4007e34774 100644
--- a/llvm/lib/CodeGen/SjLjEHPrepare.cpp
+++ b/llvm/lib/CodeGen/SjLjEHPrepare.cpp
@@ -464,8 +464,8 @@ bool SjLjEHPrepareImpl::setupEntryBlockAndCallSites(Function &F) {
}
// Register the function context and make sure it's known to not throw
- CallInst *Register =
- CallInst::Create(RegisterFn, FuncCtx, "", EntryBB->getTerminator()->getIterator());
+ CallInst *Register = CallInst::Create(
+ RegisterFn, FuncCtx, "", EntryBB->getTerminator()->getIterator());
Register->setDoesNotThrow();
// Following any allocas not in the entry block, update the saved SP in the
@@ -482,7 +482,8 @@ bool SjLjEHPrepareImpl::setupEntryBlockAndCallSites(Function &F) {
}
Instruction *StackAddr = CallInst::Create(StackAddrFn, "sp");
StackAddr->insertAfter(&I);
- new StoreInst(StackAddr, StackPtr, true, std::next(StackAddr->getIterator()));
+ new StoreInst(StackAddr, StackPtr, true,
+ std::next(StackAddr->getIterator()));
}
}
diff --git a/llvm/lib/CodeGen/WinEHPrepare.cpp b/llvm/lib/CodeGen/WinEHPrepare.cpp
index 4c09bfe90e1ed4..93a18f5bc9e8d4 100644
--- a/llvm/lib/CodeGen/WinEHPrepare.cpp
+++ b/llvm/lib/CodeGen/WinEHPrepare.cpp
@@ -1376,9 +1376,9 @@ void WinEHPrepareImpl::replaceUseWithLoad(
Value *&Load = Loads[IncomingBlock];
// Insert the load into the predecessor block
if (!Load)
- Load = new LoadInst(V->getType(), SpillSlot,
- Twine(V->getName(), ".wineh.reload"),
- /*isVolatile=*/false, IncomingBlock->getTerminator()->getIterator());
+ Load = new LoadInst(
+ V->getType(), SpillSlot, Twine(V->getName(), ".wineh.reload"),
+ /*isVolatile=*/false, IncomingBlock->getTerminator()->getIterator());
U.set(Load);
} else {
diff --git a/llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp b/llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp
index 73984f348bc465..84b4ccc1ae7ba7 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp
@@ -470,8 +470,10 @@ bool AMDGPULibCalls::sincosUseNative(CallInst *aCI, const FuncInfo &FInfo) {
nf.setId(AMDGPULibFunc::EI_COS);
FunctionCallee cosExpr = getFunction(M, nf);
if (sinExpr && cosExpr) {
- Value *sinval = CallInst::Create(sinExpr, opr0, "splitsin", aCI->getIterator());
- Value *cosval = CallInst::Create(cosExpr, opr0, "splitcos", aCI->getIterator());
+ Value *sinval =
+ CallInst::Create(sinExpr, opr0, "splitsin", aCI->getIterator());
+ Value *cosval =
+ CallInst::Create(cosExpr, opr0, "splitcos", aCI->getIterator());
new StoreInst(cosval, aCI->getArgOperand(1), aCI->getIterator());
DEBUG_WITH_TYPE("usenative", dbgs() << "<useNative> replace " << *aCI
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
index f8ee9ac5d565e5..aef0ade6d9be63 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUPrintfRuntimeBinding.cpp
@@ -290,8 +290,8 @@ bool AMDGPUPrintfRuntimeBindingImpl::lowerPrintfForGpu(Module &M) {
Value *sumC = ConstantInt::get(SizetTy, Sum, false);
SmallVector<Value *, 1> alloc_args;
alloc_args.push_back(sumC);
- CallInst *pcall =
- CallInst::Create(PrintfAllocFn, alloc_args, "printf_alloc_fn", CI->getIterator());
+ CallInst *pcall = CallInst::Create(PrintfAllocFn, alloc_args,
+ "printf_alloc_fn", CI->getIterator());
//
// Insert code to split basicblock with a
@@ -316,7 +316,8 @@ bool AMDGPUPrintfRuntimeBindingImpl::lowerPrintfForGpu(Module &M) {
// store unique printf id in the buffer
//
GetElementPtrInst *BufferIdx = GetElementPtrInst::Create(
- I8Ty, pcall, ConstantInt::get(Ctx, APInt(32, 0)), "PrintBuffID", BrnchPoint);
+ I8Ty, pcall, ConstantInt::get(Ctx, APInt(32, 0)), "PrintBuffID",
+ BrnchPoint);
Type *idPointer = PointerType::get(I32Ty, AMDGPUAS::GLOBAL_ADDRESS);
Value *id_gep_cast =
diff --git a/llvm/lib/Target/ARM/MVEGatherScatterLowering.cpp b/llvm/lib/Target/ARM/MVEGatherScatterLowering.cpp
index 6ec7a0fb51d10d..924a4580aa5fdf 100644
--- a/llvm/lib/Target/ARM/MVEGatherScatterLowering.cpp
+++ b/llvm/lib/Target/ARM/MVEGatherScatterLowering.cpp
@@ -780,7 +780,8 @@ Instruction *MVEGatherScatterLowering::tryCreateIncrementingGatScat(
// Make sure the offsets are scaled correctly
Instruction *ScaledOffsets = BinaryOperator::Create(
Instruction::Shl, OffsetsIncoming,
- Builder.CreateVectorSplat(Ty->getNumElements(), Builder.getInt32(TypeScale)),
+ Builder.CreateVectorSplat(Ty->getNumElements(),
+ Builder.getInt32(TypeScale)),
"ScaledIndex", I->getIterator());
// Add the base to the offsets
OffsetsIncoming = BinaryOperator::Create(
@@ -838,7 +839,8 @@ Instruction *MVEGatherScatterLowering::tryCreateIncrementingWBGatScat(
Instruction *ScaledOffsets = BinaryOperator::Create(
Instruction::Shl, Phi->getIncomingValue(1 - IncrementIndex),
Builder.CreateVectorSplat(NumElems, Builder.getInt32(TypeScale)),
- "ScaledIndex", Phi->getIncomingBlock(1 - IncrementIndex)->back().getIterator());
+ "ScaledIndex",
+ Phi->getIncomingBlock(1 - IncrementIndex)->back().getIterator());
// Add the base to the offsets
OffsetsIncoming = BinaryOperator::Create(
Instruction::Add, ScaledOffsets,
@@ -847,7 +849,8 @@ Instruction *MVEGatherScatterLowering::tryCreateIncrementingWBGatScat(
Builder.CreatePtrToInt(
BasePtr,
cast<VectorType>(ScaledOffsets->getType())->getElementType())),
- "StartIndex", Phi->getIncomingBlock(1 - IncrementIndex)->back().getIterator());
+ "StartIndex",
+ Phi->getIncomingBlock(1 - IncrementIndex)->back().getIterator());
// The gather is pre-incrementing
OffsetsIncoming = BinaryOperator::Create(
Instruction::Sub, OffsetsIncoming,
@@ -887,7 +890,7 @@ void MVEGatherScatterLowering::pushOutAdd(PHINode *&Phi,
unsigned StartIndex) {
LLVM_DEBUG(dbgs() << "masked gathers/scatters: optimising add instruction\n");
BasicBlock::iterator InsertionPoint =
- Phi->getIncomingBlock(StartIndex)->back().getIterator();
+ Phi->getIncomingBlock(StartIndex)->back().getIterator();
// Initialize the phi with a vector that contains a sum of the constants
Instruction *NewIndex = BinaryOperator::Create(
Instruction::Add, Phi->getIncomingValue(StartIndex), OffsSecondOperand,
@@ -925,13 +928,12 @@ void MVEGatherScatterLowering::pushOutMulShl(unsigned Opcode, PHINode *&Phi,
OffsSecondOperand, "Product", InsertionPoint);
BasicBlock::iterator NewIncrInsertPt =
- Phi->getIncomingBlock(LoopIncrement)->back().getIterator();
+ Phi->getIncomingBlock(LoopIncrement)->back().getIterator();
NewIncrInsertPt = std::prev(NewIncrInsertPt);
// Increment NewIndex by Product instead of the multiplication
Instruction *NewIncrement = BinaryOperator::Create(
- Instruction::Add, Phi, Product, "IncrementPushedOutMul",
- NewIncrInsertPt);
+ Instruction::Add, Phi, Product, "IncrementPushedOutMul", NewIncrInsertPt);
Phi->addIncoming(StartIndex,
Phi->getIncomingBlock(LoopIncrement == 1 ? 0 : 1));
diff --git a/llvm/lib/Target/BPF/BPFAbstractMemberAccess.cpp b/llvm/lib/Target/BPF/BPFAbstractMemberAccess.cpp
index ce1895bde5d9c3..4be6220b358ba3 100644
--- a/llvm/lib/Target/BPF/BPFAbstractMemberAccess.cpp
+++ b/llvm/lib/Target/BPF/BPFAbstractMemberAccess.cpp
@@ -426,8 +426,9 @@ static void replaceWithGEP(CallInst *Call, uint32_t DimensionIndex,
IdxList.push_back(Zero);
IdxList.push_back(Call->getArgOperand(GEPIndex));
- auto *GEP = GetElementPtrInst::CreateInBounds(
- getBaseElementType(Call), Call->getArgOperand(0), IdxList, "", Call->getIterator());
+ auto *GEP = GetElementPtrInst::CreateInBounds(getBaseElementType(Call),
+ Call->getArgOperand(0), IdxList,
+ "", Call->getIterator());
Call->replaceAllUsesWith(GEP);
Call->eraseFromParent();
}
@@ -1091,9 +1092,11 @@ bool BPFAbstractMemberAccess::transformGEPChain(CallInst *Call,
// Load the global variable which represents the returned field info.
LoadInst *LDInst;
if (IsInt32Ret)
- LDInst = new LoadInst(Type::getInt32Ty(BB->getContext()), GV, "", Call->getIterator());
+ LDInst = new LoadInst(Type::getInt32Ty(BB->getContext()), GV, "",
+ Call->getIterator());
else
- LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
+ LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "",
+ Call->getIterator());
Instruction *PassThroughInst =
BPFCoreSharedInfo::insertPassThrough(M, BB, LDInst, Call);
@@ -1113,7 +1116,8 @@ bool BPFAbstractMemberAccess::transformGEPChain(CallInst *Call,
// The original Call inst is removed.
// Load the global variable.
- auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
+ auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "",
+ Call->getIterator());
// Generate a BitCast
auto *BCInst =
diff --git a/llvm/lib/Target/BPF/BPFPreserveDIType.cpp b/llvm/lib/Target/BPF/BPFPreserveDIType.cpp
index 819083096150bf..afc154988050c8 100644
--- a/llvm/lib/Target/BPF/BPFPreserveDIType.cpp
+++ b/llvm/lib/Target/BPF/BPFPreserveDIType.cpp
@@ -116,8 +116,8 @@ static bool BPFPreserveDITypeImpl(Function &F) {
GV->setMetadata(LLVMContext::MD_preserve_access_index, MD);
// Load the global variable which represents the type info.
- auto *LDInst =
- new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "", Call->getIterator());
+ auto *LDInst = new LoadInst(Type::getInt64Ty(BB->getContext()), GV, "",
+ Call->getIterator());
Instruction *PassThroughInst =
BPFCoreSharedInfo::insertPassThrough(M, BB, LDInst, Call);
Call->replaceAllUsesWith(PassThroughInst);
diff --git a/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp b/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp
index 19a587c46666c4..cde02c25c48342 100644
--- a/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXLowerArgs.cpp
@@ -183,9 +183,9 @@ static void convertToParamAS(Value *OldUser, Value *Param) {
}
if (auto *GEP = dyn_cast<GetElementPtrInst>(I.OldInstruction)) {
SmallVector<Value *, 4> Indices(GEP->indices());
- auto *NewGEP = GetElementPtrInst::Create(GEP->getSourceElementType(),
- I.NewParam, Indices,
- GEP->getName(), GEP->getIterator());
+ auto *NewGEP = GetElementPtrInst::Create(
+ GEP->getSourceElementType(), I.NewParam, Indices, GEP->getName(),
+ GEP->getIterator());
NewGEP->setIsInBounds(GEP->isInBounds());
return NewGEP;
}
diff --git a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
index ca1137a8f77d8b..4a3b64f30d8d49 100644
--- a/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
+++ b/llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp
@@ -263,7 +263,8 @@ class PPCBoolRetToInt : public FunctionPass {
Value *IntRetVal = BoolToIntMap[U];
Type *Int1Ty = Type::getInt1Ty(U->getContext());
auto *I = cast<Instruction>(U.getUser());
- Value *BackToBool = new TruncInst(IntRetVal, Int1Ty, "backToBool", I->getIterator());
+ Value *BackToBool =
+ new TruncInst(IntRetVal, Int1Ty, "backToBool", I->getIterator());
U.set(BackToBool);
return true;
diff --git a/llvm/lib/Target/PowerPC/PPCLoopInstrFormPrep.cpp b/llvm/lib/Target/PowerPC/PPCLoopInstrFormPrep.cpp
index 6e2d51899cda90..f19eb2af5e0709 100644
--- a/llvm/lib/Target/PowerPC/PPCLoopInstrFormPrep.cpp
+++ b/llvm/lib/Target/PowerPC/PPCLoopInstrFormPrep.cpp
@@ -807,8 +807,7 @@ Instruction *PPCLoopInstrFormPrep::rewriteForBucketElement(
PtrIP = Element.Instr->getIterator();
assert(OffToBase && "There should be an offset for non base element!\n");
- GetElementPtrInst *NewPtr =
- GetElementPtrInst::Create(
+ GetElementPtrInst *NewPtr = GetElementPtrInst::Create(
I8Ty, PtrInc, OffToBase,
getInstrName(Element.Instr, GEPNodeOffNameSuffix));
if (PtrIP)
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp
index e84f320a280301..0427fe473f8e16 100644
--- a/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp
+++ b/llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp
@@ -1283,9 +1283,9 @@ bool WebAssemblyLowerEmscriptenEHSjLj::runSjLjOnFunction(Function &F) {
DebugLoc FirstDL = getOrCreateDebugLoc(&*Entry->begin(), F.getSubprogram());
SplitBlock(Entry, &*Entry->getFirstInsertionPt());
- BinaryOperator *SetjmpTableSize =
- BinaryOperator::Create(Instruction::Add, IRB.getInt32(4), IRB.getInt32(0),
- "setjmpTableSize", Entry->getTerminator()->getIterator());
+ BinaryOperator *SetjmpTableSize = BinaryOperator::Create(
+ Instruction::Add, IRB.getInt32(4), IRB.getInt32(0), "setjmpTableSize",
+ Entry->getTerminator()->getIterator());
SetjmpTableSize->setDebugLoc(FirstDL);
// setjmpTable = (int *) malloc(40);
Type *IntPtrTy = getAddrIntType(&M);
diff --git a/polly/lib/CodeGen/IslNodeBuilder.cpp b/polly/lib/CodeGen/IslNodeBuilder.cpp
index d48e3fee0f725e..8b2207ecbf362c 100644
--- a/polly/lib/CodeGen/IslNodeBuilder.cpp
+++ b/polly/lib/CodeGen/IslNodeBuilder.cpp
@@ -1308,7 +1308,8 @@ void IslNodeBuilder::allocateNewArrays(BBPair StartExitBlocks) {
auto InstIt = Builder.GetInsertBlock()
->getParent()
->getEntryBlock()
- .getTerminator()->getIterator();
+ .getTerminator()
+ ->getIterator();
auto *CreatedArray = new AllocaInst(NewArrayType, DL.getAllocaAddrSpace(),
SAI->getName(), InstIt);
diff --git a/polly/lib/Support/ScopHelper.cpp b/polly/lib/Support/ScopHelper.cpp
index 6afe91a27b2f4d..24c7011b06de93 100644
--- a/polly/lib/Support/ScopHelper.cpp
+++ b/polly/lib/Support/ScopHelper.cpp
@@ -328,8 +328,9 @@ struct ScopExpander final : SCEVVisitor<ScopExpander, const SCEV *> {
Value *LHS = expandCodeFor(LHSScev, E->getType(), IP);
Value *RHS = expandCodeFor(RHSScev, E->getType(), IP);
- Inst = BinaryOperator::Create((Instruction::BinaryOps)Inst->getOpcode(),
- LHS, RHS, Inst->getName() + Name, IP->getIterator());
+ Inst =
+ BinaryOperator::Create((Instruction::BinaryOps)Inst->getOpcode(), LHS,
+ RHS, Inst->getName() + Name, IP->getIterator());
return SE.getSCEV(Inst);
}
More information about the llvm-commits
mailing list