llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-aarch64 Author: Stephen Tozer (SLTozer) <details> <summary>Changes</summary> Uses the new InsertPosition class (added in #<!-- -->94226) to simplify some of the IRBuilder interface, and removes the need to pass a BasicBlock alongside a BasicBlock::iterator, using the fact that we can now get the parent basic block from the iterator even if it points to the sentinel. This patch removes the BasicBlock argument from each constructor or call to setInsertPoint. This has no functional effect, but later on as we look to remove the `Instruction *InsertBefore` argument from instruction-creation (discussed [here](https://discourse.llvm.org/t/psa-instruction-constructors-changing-to-iterator-only-insertion/77845)), this will simplify the process by allowing us to deprecate the InsertPosition constructor directly and catch all the cases where we use instructions rather than iterators. --- Patch is 122.75 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/96497.diff 97 Files Affected: - (modified) clang/lib/CodeGen/CGBlocks.cpp (+1-1) - (modified) clang/lib/CodeGen/CGGPUBuiltin.cpp (+2-2) - (modified) clang/lib/CodeGen/CGHLSLRuntime.cpp (+1-1) - (modified) clang/lib/CodeGen/CGObjC.cpp (+3-4) - (modified) clang/lib/CodeGen/CGObjCMac.cpp (+1-1) - (modified) clang/lib/CodeGen/CGOpenMPRuntime.cpp (+1-1) - (modified) clang/lib/CodeGen/CGStmt.cpp (+1-1) - (modified) clang/lib/CodeGen/CodeGenABITypes.cpp (+1-1) - (modified) clang/lib/CodeGen/CodeGenFunction.cpp (+2-2) - (modified) llvm/include/llvm/IR/IRBuilder.h (+15-63) - (modified) llvm/include/llvm/IR/Instruction.h (+6-2) - (modified) llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h (+1-3) - (modified) llvm/lib/Analysis/MemoryBuiltins.cpp (+1-1) - (modified) llvm/lib/CodeGen/AtomicExpandPass.cpp (+4-4) - (modified) llvm/lib/CodeGen/CodeGenPrepare.cpp (+2-2) - (modified) llvm/lib/CodeGen/ExpandLargeFpConvert.cpp (+2-2) - (modified) llvm/lib/CodeGen/ExpandMemCmp.cpp (+3-3) - (modified) llvm/lib/CodeGen/ExpandVectorPredication.cpp (+1-1) - (modified) llvm/lib/CodeGen/HardwareLoops.cpp (+1-1) - (modified) llvm/lib/CodeGen/IntrinsicLowering.cpp (+1-1) - (modified) llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp (+1-1) - (modified) llvm/lib/CodeGen/SafeStack.cpp (+1-1) - (modified) llvm/lib/CodeGen/ShadowStackGCLowering.cpp (+2-2) - (modified) llvm/lib/CodeGen/SjLjEHPrepare.cpp (+2-3) - (modified) llvm/lib/CodeGen/WasmEHPrepare.cpp (+1-1) - (modified) llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp (+13-16) - (modified) llvm/lib/IR/AutoUpgrade.cpp (+2-2) - (modified) llvm/lib/IR/Core.cpp (+1-1) - (modified) llvm/lib/Target/AArch64/SVEIntrinsicOpts.cpp (+2-2) - (modified) llvm/lib/Target/AMDGPU/AMDGPUAtomicOptimizer.cpp (+1-1) - (modified) llvm/lib/Target/AMDGPU/AMDGPUCodeGenPrepare.cpp (+1-1) - (modified) llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp (+1-1) - (modified) llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp (+1-1) - (modified) llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp (+1-1) - (modified) llvm/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp (+1-1) - (modified) llvm/lib/Target/ARM/ARMParallelDSP.cpp (+2-4) - (modified) llvm/lib/Target/ARM/MVELaneInterleavingPass.cpp (+1-1) - (modified) llvm/lib/Target/ARM/MVETailPredication.cpp (+1-1) - (modified) llvm/lib/Target/Hexagon/HexagonLoopIdiomRecognition.cpp (+2-2) - (modified) llvm/lib/Target/Hexagon/HexagonVectorCombine.cpp (+2-4) - (modified) llvm/lib/Target/Hexagon/HexagonVectorLoopCarriedReuse.cpp (+1-1) - (modified) llvm/lib/Target/PowerPC/PPCBoolRetToInt.cpp (+1-1) - (modified) llvm/lib/Target/SPIRV/SPIRVEmitIntrinsics.cpp (+1-1) - (modified) llvm/lib/Target/WebAssembly/WebAssemblyLowerEmscriptenEHSjLj.cpp (+1-1) - (modified) llvm/lib/Target/X86/X86LowerAMXIntrinsics.cpp (+2-2) - (modified) llvm/lib/Target/X86/X86LowerAMXType.cpp (+1-2) - (modified) llvm/lib/Target/X86/X86WinEHState.cpp (+1-1) - (modified) llvm/lib/Transforms/AggressiveInstCombine/AggressiveInstCombine.cpp (+1-1) - (modified) llvm/lib/Transforms/Coroutines/CoroFrame.cpp (+5-7) - (modified) llvm/lib/Transforms/IPO/AttributorAttributes.cpp (+1-1) - (modified) llvm/lib/Transforms/IPO/OpenMPOpt.cpp (+1-2) - (modified) llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp (+1-1) - (modified) llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp (+2-2) - (modified) llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp (+2-2) - (modified) llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp (+1-1) - (modified) llvm/lib/Transforms/InstCombine/InstCombineVectorOps.cpp (+1-1) - (modified) llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp (+2-3) - (modified) llvm/lib/Transforms/Instrumentation/BoundsChecking.cpp (+2-2) - (modified) llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp (+22-22) - (modified) llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp (+1-1) - (modified) llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp (+1-1) - (modified) llvm/lib/Transforms/Instrumentation/MemProfiler.cpp (+1-1) - (modified) llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp (+3-3) - (modified) llvm/lib/Transforms/ObjCARC/ObjCARC.cpp (+1-1) - (modified) llvm/lib/Transforms/Scalar/ConstraintElimination.cpp (+1-1) - (modified) llvm/lib/Transforms/Scalar/GuardWidening.cpp (+1-1) - (modified) llvm/lib/Transforms/Scalar/LoopBoundSplit.cpp (+1-1) - (modified) llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp (+3-3) - (modified) llvm/lib/Transforms/Scalar/LoopPredication.cpp (+1-1) - (modified) llvm/lib/Transforms/Scalar/LowerMatrixIntrinsics.cpp (+3-3) - (modified) llvm/lib/Transforms/Scalar/PartiallyInlineLibCalls.cpp (+1-1) - (modified) llvm/lib/Transforms/Scalar/RewriteStatepointsForGC.cpp (+2-2) - (modified) llvm/lib/Transforms/Scalar/SROA.cpp (+2-3) - (modified) llvm/lib/Transforms/Scalar/ScalarizeMaskedMemIntrin.cpp (+7-7) - (modified) llvm/lib/Transforms/Scalar/Scalarizer.cpp (+13-15) - (modified) llvm/lib/Transforms/Utils/AMDGPUEmitPrintf.cpp (+2-2) - (modified) llvm/lib/Transforms/Utils/BypassSlowDivision.cpp (+5-5) - (modified) llvm/lib/Transforms/Utils/CallPromotionUtils.cpp (+1-1) - (modified) llvm/lib/Transforms/Utils/FlattenCFG.cpp (+1-2) - (modified) llvm/lib/Transforms/Utils/InlineFunction.cpp (+4-4) - (modified) llvm/lib/Transforms/Utils/IntegerDivision.cpp (+1-1) - (modified) llvm/lib/Transforms/Utils/SSAUpdaterBulk.cpp (+1-1) - (modified) llvm/lib/Transforms/Utils/ScalarEvolutionExpander.cpp (+4-5) - (modified) llvm/lib/Transforms/Utils/SimplifyCFG.cpp (+1-1) - (modified) llvm/lib/Transforms/Utils/SimplifyIndVar.cpp (+2-3) - (modified) llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp (+2-2) - (modified) llvm/lib/Transforms/Vectorize/LoopIdiomVectorize.cpp (+1-1) - (modified) llvm/lib/Transforms/Vectorize/LoopVectorize.cpp (+3-5) - (modified) llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp (+11-19) - (modified) llvm/unittests/Analysis/MemorySSATest.cpp (+12-12) - (modified) llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp (+8-8) - (modified) llvm/unittests/IR/BasicBlockTest.cpp (+1-1) - (modified) llvm/unittests/IR/DebugInfoTest.cpp (+1-1) - (modified) llvm/unittests/IR/IRBuilderTest.cpp (+3-3) - (modified) llvm/unittests/Transforms/Utils/SSAUpdaterBulkTest.cpp (+1-1) - (modified) mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp (+2-3) - (modified) polly/lib/CodeGen/BlockGenerators.cpp (+2-2) ``````````diff diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp index 5dac1cd425bf6..8b1de12cc0ad7 100644 --- a/clang/lib/CodeGen/CGBlocks.cpp +++ b/clang/lib/CodeGen/CGBlocks.cpp @@ -1545,7 +1545,7 @@ llvm::Function *CodeGenFunction::GenerateBlockFunction( entry_ptr = entry_ptr->getNextNonDebugInstruction()->getIterator(); else entry_ptr = entry->end(); - Builder.SetInsertPoint(entry, entry_ptr); + Builder.SetInsertPoint(entry_ptr); // Emit debug information for all the DeclRefExprs. // FIXME: also for 'this' diff --git a/clang/lib/CodeGen/CGGPUBuiltin.cpp b/clang/lib/CodeGen/CGGPUBuiltin.cpp index bd95541647bcf..a0d5768b62f2a 100644 --- a/clang/lib/CodeGen/CGGPUBuiltin.cpp +++ b/clang/lib/CodeGen/CGGPUBuiltin.cpp @@ -202,13 +202,13 @@ RValue CodeGenFunction::EmitAMDGPUDevicePrintfCallExpr(const CallExpr *E) { Args.push_back(Arg); } - llvm::IRBuilder<> IRB(Builder.GetInsertBlock(), Builder.GetInsertPoint()); + llvm::IRBuilder<> IRB(Builder.GetInsertPoint()); IRB.SetCurrentDebugLocation(Builder.getCurrentDebugLocation()); bool isBuffered = (CGM.getTarget().getTargetOpts().AMDGPUPrintfKindVal == clang::TargetOptions::AMDGPUPrintfKind::Buffered); auto Printf = llvm::emitAMDGPUPrintfCall(IRB, Args, isBuffered); - Builder.SetInsertPoint(IRB.GetInsertBlock(), IRB.GetInsertPoint()); + Builder.SetInsertPoint(IRB.GetInsertPoint()); return RValue::get(Printf); } diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp b/clang/lib/CodeGen/CGHLSLRuntime.cpp index 55ba21ae2ba69..c9f7006b19d15 100644 --- a/clang/lib/CodeGen/CGHLSLRuntime.cpp +++ b/clang/lib/CodeGen/CGHLSLRuntime.cpp @@ -436,7 +436,7 @@ void CGHLSLRuntime::generateGlobalCtorDtorCalls() { for (auto &F : M.functions()) { if (!F.hasFnAttribute("hlsl.shader")) continue; - IRBuilder<> B(&F.getEntryBlock(), F.getEntryBlock().begin()); + IRBuilder<> B(F.getEntryBlock().begin()); for (auto *Fn : CtorFns) B.CreateCall(FunctionCallee(Fn)); diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index 281b2d9795f6c..12b5412ddb672 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -2970,13 +2970,12 @@ static llvm::Value *emitARCOperationAfterCall(CodeGenFunction &CGF, value = doFallback(CGF, value); } else if (llvm::CallInst *call = dyn_cast<llvm::CallInst>(value)) { // Place the retain immediately following the call. - CGF.Builder.SetInsertPoint(call->getParent(), - ++llvm::BasicBlock::iterator(call)); + CGF.Builder.SetInsertPoint(++llvm::BasicBlock::iterator(call)); value = doAfterCall(CGF, value); } else if (llvm::InvokeInst *invoke = dyn_cast<llvm::InvokeInst>(value)) { // Place the retain at the beginning of the normal destination block. llvm::BasicBlock *BB = invoke->getNormalDest(); - CGF.Builder.SetInsertPoint(BB, BB->begin()); + CGF.Builder.SetInsertPoint(BB->begin()); value = doAfterCall(CGF, value); // Bitcasts can arise because of related-result returns. Rewrite @@ -2984,7 +2983,7 @@ static llvm::Value *emitARCOperationAfterCall(CodeGenFunction &CGF, } else if (llvm::BitCastInst *bitcast = dyn_cast<llvm::BitCastInst>(value)) { // Change the insert point to avoid emitting the fall-back call after the // bitcast. - CGF.Builder.SetInsertPoint(bitcast->getParent(), bitcast->getIterator()); + CGF.Builder.SetInsertPoint(bitcast->getIterator()); llvm::Value *operand = bitcast->getOperand(0); operand = emitARCOperationAfterCall(CGF, operand, doAfterCall, doFallback); bitcast->setOperand(0, operand); diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index 30f3911a8b03c..b7debc8fb469d 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/lib/CodeGen/CGObjCMac.cpp @@ -4417,7 +4417,7 @@ void FragileHazards::emitHazardsInNewBlocks() { // call. If the call throws, then this is sufficient to // guarantee correctness as long as it doesn't also write to any // locals. - Builder.SetInsertPoint(&BB, BI); + Builder.SetInsertPoint(BI); emitReadHazard(Builder); } } diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp index f6d12d46cfc07..532c40841f20f 100644 --- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp +++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp @@ -1447,7 +1447,7 @@ llvm::Value *CGOpenMPRuntime::getThreadID(CodeGenFunction &CGF, if (!Elem.second.ServiceInsertPt) setLocThreadIdInsertPt(CGF); CGBuilderTy::InsertPointGuard IPG(CGF.Builder); - CGF.Builder.SetInsertPoint(Elem.second.ServiceInsertPt); + CGF.Builder.SetInsertPoint(&*Elem.second.ServiceInsertPt); auto DL = ApplyDebugLocation::CreateDefaultArtificial(CGF, Loc); llvm::CallInst *Call = CGF.Builder.CreateCall( OMPBuilder.getOrCreateRuntimeFunction(CGM.getModule(), diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp index 39222c0e65353..1a2a76ec2dd85 100644 --- a/clang/lib/CodeGen/CGStmt.cpp +++ b/clang/lib/CodeGen/CGStmt.cpp @@ -3076,7 +3076,7 @@ void CodeGenFunction::EmitAsmStmt(const AsmStmt &S) { if (IsGCCAsmGoto && !CBRRegResults.empty()) { for (llvm::BasicBlock *Succ : CBR->getIndirectDests()) { llvm::IRBuilderBase::InsertPointGuard IPG(Builder); - Builder.SetInsertPoint(Succ, --(Succ->end())); + Builder.SetInsertPoint(--(Succ->end())); EmitAsmStores(*this, S, CBRRegResults[Succ], ResultRegTypes, ResultTruncRegTypes, ResultRegDests, ResultRegQualTys, ResultTypeRequiresCast, ResultRegIsFlagReg); diff --git a/clang/lib/CodeGen/CodeGenABITypes.cpp b/clang/lib/CodeGen/CodeGenABITypes.cpp index a6073e1188d6f..4c2e9b8233057 100644 --- a/clang/lib/CodeGen/CodeGenABITypes.cpp +++ b/clang/lib/CodeGen/CodeGenABITypes.cpp @@ -123,7 +123,7 @@ llvm::Value *CodeGen::getCXXDestructorImplicitParam( CGF.CurCodeDecl = D; CGF.CurFuncDecl = D; CGF.CurFn = InsertBlock->getParent(); - CGF.Builder.SetInsertPoint(InsertBlock, InsertPoint); + CGF.Builder.SetInsertPoint(InsertPoint); return CGM.getCXXABI().getCXXDestructorImplicitParam( CGF, D, Type, ForVirtualBase, Delegating); } diff --git a/clang/lib/CodeGen/CodeGenFunction.cpp b/clang/lib/CodeGen/CodeGenFunction.cpp index 200c40da8bc43..3f8c900a00455 100644 --- a/clang/lib/CodeGen/CodeGenFunction.cpp +++ b/clang/lib/CodeGen/CodeGenFunction.cpp @@ -2759,7 +2759,7 @@ void CodeGenFunction::EmitSanitizerStatReport(llvm::SanitizerStatKind SSK) { if (!CGM.getCodeGenOpts().SanitizeStats) return; - llvm::IRBuilder<> IRB(Builder.GetInsertBlock(), Builder.GetInsertPoint()); + llvm::IRBuilder<> IRB(Builder.GetInsertPoint()); IRB.SetCurrentDebugLocation(Builder.getCurrentDebugLocation()); CGM.getSanStats().create(IRB, SSK); } @@ -2878,7 +2878,7 @@ void CodeGenFunction::EmitAArch64MultiVersionResolver( } if (!AArch64CpuInitialized) { - Builder.SetInsertPoint(CurBlock, CurBlock->begin()); + Builder.SetInsertPoint(CurBlock->begin()); EmitAArch64CpuInit(); AArch64CpuInitialized = true; Builder.SetInsertPoint(CurBlock); diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h index c10ea33a4ee13..fc660fda8aaf4 100644 --- a/llvm/include/llvm/IR/IRBuilder.h +++ b/llvm/include/llvm/IR/IRBuilder.h @@ -173,37 +173,13 @@ class IRBuilderBase { BasicBlock::iterator GetInsertPoint() const { return InsertPt; } LLVMContext &getContext() const { return Context; } - /// This specifies that created instructions should be appended to the - /// end of the specified block. - void SetInsertPoint(BasicBlock *TheBB) { - BB = TheBB; - InsertPt = BB->end(); - } - - /// This specifies that created instructions should be inserted before - /// the specified instruction. - void SetInsertPoint(Instruction *I) { - BB = I->getParent(); - InsertPt = I->getIterator(); - assert(InsertPt != BB->end() && "Can't read debug loc from end()"); - SetCurrentDebugLocation(I->getStableDebugLoc()); - } - /// This specifies that created instructions should be inserted at the - /// specified point. - void SetInsertPoint(BasicBlock *TheBB, BasicBlock::iterator IP) { - BB = TheBB; - InsertPt = IP; - if (IP != TheBB->end()) - SetCurrentDebugLocation(IP->getStableDebugLoc()); - } - - /// This specifies that created instructions should be inserted at - /// the specified point, but also requires that \p IP is dereferencable. - void SetInsertPoint(BasicBlock::iterator IP) { - BB = IP->getParent(); + /// specified insert position. + void SetInsertPoint(InsertPosition IP) { + BB = IP.getBasicBlock(); InsertPt = IP; - SetCurrentDebugLocation(IP->getStableDebugLoc()); + if (InsertPt != BB->end()) + SetCurrentDebugLocation(InsertPt->getStableDebugLoc()); } /// This specifies that created instructions should inserted at the beginning @@ -286,7 +262,7 @@ class IRBuilderBase { /// Sets the current insert point to a previously-saved location. void restoreIP(InsertPoint IP) { if (IP.isSet()) - SetInsertPoint(IP.getBlock(), IP.getPoint()); + SetInsertPoint(IP.getPoint()); else ClearInsertionPoint(); } @@ -2677,44 +2653,20 @@ class IRBuilder : public IRBuilderBase { ArrayRef<OperandBundleDef> OpBundles = std::nullopt) : IRBuilderBase(C, this->Folder, this->Inserter, FPMathTag, OpBundles) {} - explicit IRBuilder(BasicBlock *TheBB, FolderTy Folder, - MDNode *FPMathTag = nullptr, - ArrayRef<OperandBundleDef> OpBundles = std::nullopt) - : IRBuilderBase(TheBB->getContext(), this->Folder, this->Inserter, - FPMathTag, OpBundles), - Folder(Folder) { - SetInsertPoint(TheBB); - } - - explicit IRBuilder(BasicBlock *TheBB, MDNode *FPMathTag = nullptr, + explicit IRBuilder(InsertPosition IP, MDNode *FPMathTag = nullptr, ArrayRef<OperandBundleDef> OpBundles = std::nullopt) - : IRBuilderBase(TheBB->getContext(), this->Folder, this->Inserter, - FPMathTag, OpBundles) { - SetInsertPoint(TheBB); - } - - explicit IRBuilder(Instruction *IP, MDNode *FPMathTag = nullptr, - ArrayRef<OperandBundleDef> OpBundles = std::nullopt) - : IRBuilderBase(IP->getContext(), this->Folder, this->Inserter, FPMathTag, - OpBundles) { + : IRBuilderBase(IP.getBasicBlock()->getContext(), this->Folder, + this->Inserter, FPMathTag, OpBundles) { SetInsertPoint(IP); } - IRBuilder(BasicBlock *TheBB, BasicBlock::iterator IP, FolderTy Folder, - MDNode *FPMathTag = nullptr, - ArrayRef<OperandBundleDef> OpBundles = std::nullopt) - : IRBuilderBase(TheBB->getContext(), this->Folder, this->Inserter, - FPMathTag, OpBundles), + explicit IRBuilder(InsertPosition IP, FolderTy Folder, + MDNode *FPMathTag = nullptr, + ArrayRef<OperandBundleDef> OpBundles = std::nullopt) + : IRBuilderBase(IP.getBasicBlock()->getContext(), this->Folder, + this->Inserter, FPMathTag, OpBundles), Folder(Folder) { - SetInsertPoint(TheBB, IP); - } - - IRBuilder(BasicBlock *TheBB, BasicBlock::iterator IP, - MDNode *FPMathTag = nullptr, - ArrayRef<OperandBundleDef> OpBundles = std::nullopt) - : IRBuilderBase(TheBB->getContext(), this->Folder, this->Inserter, - FPMathTag, OpBundles) { - SetInsertPoint(TheBB, IP); + SetInsertPoint(IP); } /// Avoid copying the full IRBuilder. Prefer using InsertPointGuard diff --git a/llvm/include/llvm/IR/Instruction.h b/llvm/include/llvm/IR/Instruction.h index 2e72f6742a659..c315a41ebcf8b 100644 --- a/llvm/include/llvm/IR/Instruction.h +++ b/llvm/include/llvm/IR/Instruction.h @@ -44,6 +44,12 @@ template <> struct ilist_alloc_traits<Instruction> { iterator_range<simple_ilist<DbgRecord>::iterator> getDbgRecordRange(DbgMarker *); +/// Class used to generate an insert position (ultimately always a +/// BasicBlock::iterator, which it will implicitly convert to) from either: +/// - An Instruction, inserting immediately prior. +/// - A BasicBlock, inserting at the end. +/// - An iterator, inserting at its position. +/// - Any nullptr value, giving a blank iterator (not valid for insertion). class InsertPosition { using InstListType = SymbolTableList<Instruction, ilist_iterator_bits<true>, ilist_parent<BasicBlock>>; @@ -51,8 +57,6 @@ class InsertPosition { public: InsertPosition(std::nullptr_t) : InsertAt() {} - // LLVM_DEPRECATED("Use BasicBlock::iterators for insertion instead", - // "BasicBlock::iterator") InsertPosition(Instruction *InsertBefore); InsertPosition(BasicBlock *InsertAtEnd); InsertPosition(InstListType::iterator InsertAt) : InsertAt(InsertAt) {} diff --git a/llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h b/llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h index 62c1e15a9a60e..e7a1ab08ed75d 100644 --- a/llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h +++ b/llvm/include/llvm/Transforms/Utils/ScalarEvolutionExpander.h @@ -376,9 +376,7 @@ class SCEVExpander : public SCEVVisitor<SCEVExpander, Value *> { Builder.SetInsertPoint(IP); } - void setInsertPoint(BasicBlock::iterator IP) { - Builder.SetInsertPoint(IP->getParent(), IP); - } + void setInsertPoint(BasicBlock::iterator IP) { Builder.SetInsertPoint(IP); } /// Clear the current insertion point. This is useful if the instruction /// that had been serving as the insertion point may have been deleted. diff --git a/llvm/lib/Analysis/MemoryBuiltins.cpp b/llvm/lib/Analysis/MemoryBuiltins.cpp index 8ca15434833d9..5b12024da0e11 100644 --- a/llvm/lib/Analysis/MemoryBuiltins.cpp +++ b/llvm/lib/Analysis/MemoryBuiltins.cpp @@ -1217,7 +1217,7 @@ SizeOffsetValue ObjectSizeOffsetEvaluator::visitPHINode(PHINode &PHI) { // Compute offset/size for each PHI incoming pointer. for (unsigned i = 0, e = PHI.getNumIncomingValues(); i != e; ++i) { BasicBlock *IncomingBlock = PHI.getIncomingBlock(i); - Builder.SetInsertPoint(IncomingBlock, IncomingBlock->getFirstInsertionPt()); + Builder.SetInsertPoint(IncomingBlock->getFirstInsertionPt()); SizeOffsetValue EdgeData = compute_(PHI.getIncomingValue(i)); if (!EdgeData.bothKnown()) { diff --git a/llvm/lib/CodeGen/AtomicExpandPass.cpp b/llvm/lib/CodeGen/AtomicExpandPass.cpp index 7728cc50fc9f9..9f6552c5dfc1d 100644 --- a/llvm/lib/CodeGen/AtomicExpandPass.cpp +++ b/llvm/lib/CodeGen/AtomicExpandPass.cpp @@ -1242,7 +1242,7 @@ Value *AtomicExpandImpl::insertRMWLLSCLoop( StoreSuccess, ConstantInt::get(IntegerType::get(Ctx, 32), 0), "tryagain"); Builder.CreateCondBr(TryAgain, LoopBB, ExitBB); - Builder.SetInsertPoint(ExitBB, ExitBB->begin()); + Builder.SetInsertPoint(ExitBB->begin()); return Loaded; } @@ -1478,7 +1478,7 @@ bool AtomicExpandImpl::expandAtomicCmpXchg(AtomicCmpXchgInst *CI) { // succeeded or not. We expose this to later passes by converting any // subsequent "icmp eq/ne %loaded, %oldval" into a use of an appropriate // PHI. - Builder.SetInsertPoint(ExitBB, ExitBB->begin()); + Builder.SetInsertPoint(ExitBB->begin()); PHINode *LoadedExit = Builder.CreatePHI(UnreleasedLoad->getType(), 2, "loaded.exit"); LoadedExit->addIncoming(LoadedTryStore, SuccessBB); @@ -1491,7 +1491,7 @@ bool AtomicExpandImpl::expandAtomicCmpXchg(AtomicCmpXchgInst *CI) { // a type wider than the one in the cmpxchg instruction. Value *LoadedFull = LoadedExit; - Builder.SetInsertPoint(ExitBB, std::next(Success->getIterator())); + Builder.SetInsertPoint(std::next(Success->getIterator())); Value *Loaded = extractMaskedValue(Builder, LoadedFull, PMV); // Look for any users of the cmpxchg that are just comparing the loaded value @@ -1616,7 +1616,7 @@ Value *AtomicExpandImpl::insertRMWCmpXchgLoop( Builder.CreateCondBr(Success, ExitBB, LoopBB); - Builder.SetInsertPoint(ExitBB, ExitBB->begin()); + Builder.SetInsertPoint(ExitBB->begin()); return NewLoaded; } diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp index f8fdba2e35dd7..a6e101c32d7bf 100644 --- a/llvm/lib/CodeGen/CodeGenPrepare.cpp +++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp @@ -2355,7 +2355,7 @@ static bool despeculateCountZeros(IntrinsicInst *CountZeros, // Create a PHI in the end block to select either the output of the intrinsic // or the bit width of the operand. - Builder.SetInsertPoint(EndBlock, EndBlock->begin()); + Builder.SetInsertPoint(EndBlock->begin()); PHINode *PN = Builder.CreatePHI(Ty, 2, "ctz"); replaceAllUsesWith(CountZeros, PN, FreshBBs, IsHugeFunc); Value *BitWidth = Builder.getInt(APInt(SizeInBits, SizeInBits)); @@ -6306,7 +6306,7 @@ bool CodeGenPrepare::splitLargeGEPOffsets() { NewBaseInsertBB = &BaseGEP->getFunction()->getEntryBlock(); NewBaseInsertPt = NewBaseInsertBB->getFirstInsertionPt(); } - IRBuilder<> NewBaseBuilder(NewBaseInsertBB, NewBaseInsertPt); + IRBuilder<> NewBaseBuilder(NewBaseInsertPt); // Create a new base. Value *BaseIndex = ConstantInt::get(PtrIdxTy, BaseOffset); NewBaseGEP = OldBase; diff --git a/llvm/lib/CodeGen/ExpandLargeFpConvert.cpp b/llvm/lib/CodeGen/ExpandLargeFpConvert.cpp index 11f123aa5bed8..2c05f01726770 100644 --- a/llvm/lib/CodeGen/ExpandLargeFpConvert.cpp +++ b/llvm/lib/CodeGen/ExpandLargeFpConvert.cpp @@ -212,7 +212,7 @@ static void expandFPToI(Instruction *FPToI) { Builder.CreateBr(End); // cleanup: - Builder.SetInsertPoint(End, End->begin()); + Builder.SetInsertPoint(End->begin()); PHINode *Retval0 = Builder.CreatePHI(FPToI->getType(), 4); Retval0->addIncoming(Cond8, IfThen5); @@ -560,7 +560,7 @@ static void expandIToFP(Instruction *IToFP) { Builder.CreateBr(End); // return: - Builder.SetInsertPoint(End, End->begin()); + Builder.SetInsertPoint(End->begin()); PHINode *Retval0 = Builder.CreatePHI(IToFP->getType(), 2); Retval0->addIncoming(A4, IfEnd26); Retval0->addIncoming(ConstantFP::getZero(IToFP->getType(), false), Entry); diff --git a/llvm/lib/CodeGen/ExpandMemCmp.cpp b/llvm/lib/CodeGen/ExpandMemCmp.cpp index bb84813569f4d..3e59834e4f1c8 100644 --- a/llvm/lib/CodeGen/ExpandMemCmp.cpp +++ b/llvm/lib/CodeGen/ExpandMemCmp.cpp @@ -574,7 +574,7 @@ void MemCmpExpansion::emitMemCmpResultBlock() { // need to be calculated and can simply return 1. if (IsUsedForZeroCmp) { BasicBlock::iterator InsertPt = ResBlock.BB->getFirstInsertionPt(); - Builder.SetInsertPoint(ResBlock.BB, InsertPt); + Builder.SetInsertPoint(InsertPt); Value *Res = ConstantInt::get(Type::getInt32Ty(CI->getContext()), 1); PhiRes->addIncoming(Res, ResBlock.BB); BranchInst *NewBr = BranchInst::Create(EndBlock); @@ -584,7 +584,7 @@ void MemCmpExpansion::emitMemCmpResultBlock() { return; } BasicBlock::iterator InsertPt = ResBlock.BB->getFirstInsertionPt(); - Builder.SetInsertPoint(ResBlock.BB, InsertPt); + Builder.SetInsertPoint(InsertPt); Value *Cmp = Builder.CreateICmp(ICmpInst::ICMP_ULT, ResBlock.PhiSrc1, ResBlock.PhiSrc2); @@ -611,7 +611,7 @@ void MemCmpExpansion::setupResultBlockPHINodes() { } void MemCmpExpansion::setupEndBlockPHINodes() { - Builder.SetInsertPoint(EndBlock, EndBlock->begin()); + Builder.SetInsertPoint(EndBlock->begin()); PhiRes = Builder.CreatePHI(Type::getInt32Ty(CI->getContext()), 2, "phi.res"); } diff --git a/llvm/lib/CodeGen/ExpandVectorPredication.cpp b/llvm/lib/CodeGen/ExpandVectorPredication.cpp index dc35f33a3a059..a63a8681f5140 100644 --- a/llvm/lib/CodeGen/ExpandVectorPredication.cpp +++ b/llvm/lib/CodeGen/ExpandVectorPredication.cpp @@ -667,7 +667,7 @@ void CachingVPExpander::discardEVLParameter(VPIntrinsic &VPI) { auto *M = VPI.getModule(); Function *VScaleFunc = Intrinsic::getDeclaration(M, Intrinsic::vscale, Int32Ty); - IRBuilder<> Builder(VPI.getParent(), VPI.getIterator()); + IRBuilder<> Builder(VPI.getIterator()); Value *FactorConst = Builder.getInt32(StaticElemCount.getKnownMinVa... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/96497 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
