[llvm] fb9ed19 - [IR] Add BasicBlock::isEntryBlock() (NFC)
Nikita Popov via llvm-commits
llvm-commits at lists.llvm.org
Sat May 15 03:42:08 PDT 2021
Author: Nikita Popov
Date: 2021-05-15T12:41:58+02:00
New Revision: fb9ed1979a712a86c246dc136f8134e8e97a883c
URL: https://github.com/llvm/llvm-project/commit/fb9ed1979a712a86c246dc136f8134e8e97a883c
DIFF: https://github.com/llvm/llvm-project/commit/fb9ed1979a712a86c246dc136f8134e8e97a883c.diff
LOG: [IR] Add BasicBlock::isEntryBlock() (NFC)
This is a recurring and somewhat awkward pattern. Add a helper
method for it.
Added:
Modified:
llvm/include/llvm/IR/BasicBlock.h
llvm/lib/Analysis/CFG.cpp
llvm/lib/Analysis/CaptureTracking.cpp
llvm/lib/Analysis/InstructionSimplify.cpp
llvm/lib/Analysis/LazyValueInfo.cpp
llvm/lib/Analysis/MemorySSA.cpp
llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
llvm/lib/IR/AsmWriter.cpp
llvm/lib/IR/BasicBlock.cpp
llvm/lib/Passes/StandardInstrumentations.cpp
llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
llvm/lib/Transforms/Scalar/LoopDeletion.cpp
llvm/lib/Transforms/Scalar/MergeICmps.cpp
llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
llvm/lib/Transforms/Utils/Local.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/IR/BasicBlock.h b/llvm/include/llvm/IR/BasicBlock.h
index b86bb16e12396..db831bdb37904 100644
--- a/llvm/include/llvm/IR/BasicBlock.h
+++ b/llvm/include/llvm/IR/BasicBlock.h
@@ -480,6 +480,10 @@ class BasicBlock final : public Value, // Basic blocks are data objects also
/// Return true if it is legal to hoist instructions into this block.
bool isLegalToHoistInto() const;
+ /// Return true if this is the entry block of the containing function.
+ /// This method can only be used on blocks that have a parent function.
+ bool isEntryBlock() const;
+
Optional<uint64_t> getIrrLoopHeaderWeight() const;
/// Returns true if the Order field of child Instructions is valid.
diff --git a/llvm/lib/Analysis/CFG.cpp b/llvm/lib/Analysis/CFG.cpp
index 9b26c38e4916e..650103fbc619b 100644
--- a/llvm/lib/Analysis/CFG.cpp
+++ b/llvm/lib/Analysis/CFG.cpp
@@ -248,7 +248,7 @@ bool llvm::isPotentiallyReachable(
// Can't be in a loop if it's the entry block -- the entry block may not
// have predecessors.
- if (BB == &BB->getParent()->getEntryBlock())
+ if (BB->isEntryBlock())
return false;
// Otherwise, continue doing the normal per-BB CFG walk.
@@ -267,10 +267,10 @@ bool llvm::isPotentiallyReachable(
!DT->isReachableFromEntry(B->getParent()))
return false;
if (!ExclusionSet || ExclusionSet->empty()) {
- if (A->getParent() == &A->getParent()->getParent()->getEntryBlock() &&
+ if (A->getParent()->isEntryBlock() &&
DT->isReachableFromEntry(B->getParent()))
return true;
- if (B->getParent() == &A->getParent()->getParent()->getEntryBlock() &&
+ if (B->getParent()->isEntryBlock() &&
DT->isReachableFromEntry(A->getParent()))
return false;
}
diff --git a/llvm/lib/Analysis/CaptureTracking.cpp b/llvm/lib/Analysis/CaptureTracking.cpp
index 179b09da17254..4ad9b4b9c7db9 100644
--- a/llvm/lib/Analysis/CaptureTracking.cpp
+++ b/llvm/lib/Analysis/CaptureTracking.cpp
@@ -134,8 +134,7 @@ namespace {
//
// (1) BB is an entry block or have no successors.
// (2) There's no path coming back through BB successors.
- if (BB == &BB->getParent()->getEntryBlock() ||
- !BB->getTerminator()->getNumSuccessors())
+ if (BB->isEntryBlock() || !BB->getTerminator()->getNumSuccessors())
return true;
SmallVector<BasicBlock*, 32> Worklist;
diff --git a/llvm/lib/Analysis/InstructionSimplify.cpp b/llvm/lib/Analysis/InstructionSimplify.cpp
index f91c534fc8264..08fccc21cf3a2 100644
--- a/llvm/lib/Analysis/InstructionSimplify.cpp
+++ b/llvm/lib/Analysis/InstructionSimplify.cpp
@@ -224,8 +224,8 @@ static bool valueDominatesPHI(Value *V, PHINode *P, const DominatorTree *DT) {
// Otherwise, if the instruction is in the entry block and is not an invoke,
// then it obviously dominates all phi nodes.
- if (I->getParent() == &I->getFunction()->getEntryBlock() &&
- !isa<InvokeInst>(I) && !isa<CallBrInst>(I))
+ if (I->getParent()->isEntryBlock() && !isa<InvokeInst>(I) &&
+ !isa<CallBrInst>(I))
return true;
return false;
diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp
index ea332148ceee2..83d83f45c972c 100644
--- a/llvm/lib/Analysis/LazyValueInfo.cpp
+++ b/llvm/lib/Analysis/LazyValueInfo.cpp
@@ -673,7 +673,7 @@ Optional<ValueLatticeElement> LazyValueInfoImpl::solveBlockValueNonLocal(
// If this is the entry block, we must be asking about an argument. The
// value is overdefined.
- if (BB == &BB->getParent()->getEntryBlock()) {
+ if (BB->isEntryBlock()) {
assert(isa<Argument>(Val) && "Unknown live-in to the entry block");
return ValueLatticeElement::getOverdefined();
}
diff --git a/llvm/lib/Analysis/MemorySSA.cpp b/llvm/lib/Analysis/MemorySSA.cpp
index f6f7d9cb3ce34..b402b0467f5de 100644
--- a/llvm/lib/Analysis/MemorySSA.cpp
+++ b/llvm/lib/Analysis/MemorySSA.cpp
@@ -2553,9 +2553,8 @@ bool upward_defs_iterator::IsGuaranteedLoopInvariant(Value *Ptr) const {
Ptr = Ptr->stripPointerCasts();
if (auto *I = dyn_cast<Instruction>(Ptr)) {
- if (I->getParent() == &I->getFunction()->getEntryBlock()) {
+ if (I->getParent()->isEntryBlock())
return true;
- }
}
if (auto *GEP = dyn_cast<GEPOperator>(Ptr)) {
return IsGuaranteedLoopInvariantBase(GEP->getPointerOperand()) &&
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 7d6d1ea950f2f..c0376f2fe9dcc 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -2072,7 +2072,7 @@ bool SelectionDAGBuilder::isExportableFromCurrentBlock(const Value *V,
// If this is an argument, we can export it if the BB is the entry block or
// if it is already exported.
if (isa<Argument>(V)) {
- if (FromBB == &FromBB->getParent()->getEntryBlock())
+ if (FromBB->isEntryBlock())
return true;
// Otherwise, can only export this if it is already exported.
diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp
index 5b60b89e7a007..57581abdd2e81 100644
--- a/llvm/lib/IR/AsmWriter.cpp
+++ b/llvm/lib/IR/AsmWriter.cpp
@@ -3858,7 +3858,7 @@ void AssemblyWriter::printArgument(const Argument *Arg, AttributeSet Attrs) {
/// printBasicBlock - This member is called for each basic block in a method.
void AssemblyWriter::printBasicBlock(const BasicBlock *BB) {
assert(BB && BB->getParent() && "block without parent!");
- bool IsEntryBlock = BB == &BB->getParent()->getEntryBlock();
+ bool IsEntryBlock = BB->isEntryBlock();
if (BB->hasName()) { // Print out the label if it exists...
Out << "\n";
PrintLLVMName(Out, BB->getName(), LabelPrefix);
diff --git a/llvm/lib/IR/BasicBlock.cpp b/llvm/lib/IR/BasicBlock.cpp
index 48227d8e6c6bd..d14abafdef2eb 100644
--- a/llvm/lib/IR/BasicBlock.cpp
+++ b/llvm/lib/IR/BasicBlock.cpp
@@ -372,6 +372,12 @@ bool BasicBlock::isLegalToHoistInto() const {
return !Term->isExceptionalTerminator();
}
+bool BasicBlock::isEntryBlock() const {
+ const Function *F = getParent();
+ assert(F && "Block must have a parent function to use this API");
+ return this == &F->getEntryBlock();
+}
+
BasicBlock *BasicBlock::splitBasicBlock(iterator I, const Twine &BBName,
bool Before) {
if (Before)
diff --git a/llvm/lib/Passes/StandardInstrumentations.cpp b/llvm/lib/Passes/StandardInstrumentations.cpp
index 8767d2b2f5271..ae9b8a83157df 100644
--- a/llvm/lib/Passes/StandardInstrumentations.cpp
+++ b/llvm/lib/Passes/StandardInstrumentations.cpp
@@ -970,7 +970,7 @@ static void printBBName(raw_ostream &out, const BasicBlock *BB) {
return;
}
- if (BB == &BB->getParent()->getEntryBlock()) {
+ if (BB->isEntryBlock()) {
out << "entry"
<< "<" << BB << ">";
return;
diff --git a/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp b/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
index 5d4a888719514..201a60801dd36 100644
--- a/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
+++ b/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
@@ -1270,9 +1270,8 @@ struct DSEState {
Ptr = Ptr->stripPointerCasts();
if (auto *I = dyn_cast<Instruction>(Ptr)) {
- if (I->getParent() == &I->getFunction()->getEntryBlock()) {
+ if (I->getParent()->isEntryBlock())
return true;
- }
}
if (auto *GEP = dyn_cast<GEPOperator>(Ptr)) {
return IsGuaranteedLoopInvariantBase(GEP->getPointerOperand()) &&
diff --git a/llvm/lib/Transforms/Scalar/LoopDeletion.cpp b/llvm/lib/Transforms/Scalar/LoopDeletion.cpp
index 1266c93316fa1..fd0e983b6199a 100644
--- a/llvm/lib/Transforms/Scalar/LoopDeletion.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopDeletion.cpp
@@ -114,7 +114,7 @@ static bool isLoopNeverExecuted(Loop *L) {
// predecessor.
assert(Preheader && "Needs preheader!");
- if (Preheader == &Preheader->getParent()->getEntryBlock())
+ if (Preheader->isEntryBlock())
return false;
// All predecessors of the preheader should have a constant conditional
// branch, with the loop's preheader as not-taken.
diff --git a/llvm/lib/Transforms/Scalar/MergeICmps.cpp b/llvm/lib/Transforms/Scalar/MergeICmps.cpp
index cafe6144c13f9..0c27a609d9638 100644
--- a/llvm/lib/Transforms/Scalar/MergeICmps.cpp
+++ b/llvm/lib/Transforms/Scalar/MergeICmps.cpp
@@ -732,8 +732,7 @@ bool BCECmpChain::simplify(const TargetLibraryInfo &TLI, AliasAnalysis &AA,
// If the old cmp chain was the function entry, we need to update the function
// entry.
- const bool ChainEntryIsFnEntry =
- (EntryBlock_ == &EntryBlock_->getParent()->getEntryBlock());
+ const bool ChainEntryIsFnEntry = EntryBlock_->isEntryBlock();
if (ChainEntryIsFnEntry && DTU.hasDomTree()) {
LLVM_DEBUG(dbgs() << "Changing function entry from "
<< EntryBlock_->getName() << " to "
diff --git a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
index 5690200220d46..e3cf643eb7edf 100644
--- a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
+++ b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
@@ -887,7 +887,7 @@ static void UpdateAnalysisInformation(BasicBlock *OldBB, BasicBlock *NewBB,
if (DTU) {
// Recalculation of DomTree is needed when updating a forward DomTree and
// the Entry BB is replaced.
- if (NewBB == &NewBB->getParent()->getEntryBlock() && DTU->hasDomTree()) {
+ if (NewBB->isEntryBlock() && DTU->hasDomTree()) {
// The entry block was removed and there is no external interface for
// the dominator tree to be notified of this change. In this corner-case
// we recalculate the entire tree.
@@ -906,7 +906,7 @@ static void UpdateAnalysisInformation(BasicBlock *OldBB, BasicBlock *NewBB,
}
} else if (DT) {
if (OldBB == DT->getRootNode()->getBlock()) {
- assert(NewBB == &NewBB->getParent()->getEntryBlock());
+ assert(NewBB->isEntryBlock());
DT->setNewRoot(NewBB);
} else {
// Split block expects NewBB to have a non-empty set of predecessors.
diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp
index 1c1d46bf46cca..14f54ed8bf168 100644
--- a/llvm/lib/Transforms/Utils/Local.cpp
+++ b/llvm/lib/Transforms/Utils/Local.cpp
@@ -738,9 +738,7 @@ void llvm::MergeBasicBlockIntoOnlyPred(BasicBlock *DestBB,
BasicBlock *PredBB = DestBB->getSinglePredecessor();
assert(PredBB && "Block doesn't have a single predecessor!");
- bool ReplaceEntryBB = false;
- if (PredBB == &DestBB->getParent()->getEntryBlock())
- ReplaceEntryBB = true;
+ bool ReplaceEntryBB = PredBB->isEntryBlock();
// DTU updates: Collect all the edges that enter
// PredBB. These dominator edges will be redirected to DestBB.
More information about the llvm-commits
mailing list