Standardize {pred,succ,use,user}_empty()

The functions {pred,succ,use,user}_{begin,end} exist, but many users
have to check *_begin() with *_end() by hand to determine if the
BasicBlock or User is empty. Fix this with a standard *_empty(),
demonstrating a few usecases.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225760 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/IR/CFG.h b/include/llvm/IR/CFG.h
index c8be8bd1f2a7a3bd9d41ecf88216aa81747d7432..5400d2384868d27dc7a2fc5bc4b8a4f8b1e9f159 100644 (file)
--- a/include/llvm/IR/CFG.h
+++ b/include/llvm/IR/CFG.h
@@ -93,6 +93,9 @@ inline pred_iterator pred_end(BasicBlock *BB) { return pred_iterator(BB, true);}
 inline const_pred_iterator pred_end(const BasicBlock *BB) {
   return const_pred_iterator(BB, true);
 }
 inline const_pred_iterator pred_end(const BasicBlock *BB) {
   return const_pred_iterator(BB, true);
 }

+inline bool pred_empty(const BasicBlock *BB) {
+  return pred_begin(BB) == pred_end(BB);
+}

 
 
 
 
 
 


@@ -257,6 +260,9 @@ inline succ_iterator succ_end(BasicBlock *BB) {
 inline succ_const_iterator succ_end(const BasicBlock *BB) {
   return succ_const_iterator(BB->getTerminator(), true);
 }
 inline succ_const_iterator succ_end(const BasicBlock *BB) {
   return succ_const_iterator(BB->getTerminator(), true);
 }

+inline bool succ_empty(const BasicBlock *BB) {
+  return succ_begin(BB) == succ_end(BB);
+}

 
 template <typename T, typename U> struct isPodLike<SuccIterator<T, U> > {
   static const bool value = isPodLike<T>::value;
 
 template <typename T, typename U> struct isPodLike<SuccIterator<T, U> > {
   static const bool value = isPodLike<T>::value;

diff --git a/include/llvm/IR/Value.h b/include/llvm/IR/Value.h
index 92070210f2c405558d6b17f4387490fecf7e7bff..705fc0f52d58997553575c1f0da4ac8aa6e00aa6 100644 (file)
--- a/include/llvm/IR/Value.h
+++ b/include/llvm/IR/Value.h
@@ -286,6 +286,8 @@ public:
     return iterator_range<const_use_iterator>(use_begin(), use_end());
   }
 
     return iterator_range<const_use_iterator>(use_begin(), use_end());
   }
 

+  bool               user_empty() const { return UseList == nullptr; }
+

   typedef user_iterator_impl<User>       user_iterator;
   typedef user_iterator_impl<const User> const_user_iterator;
   user_iterator       user_begin()       { return user_iterator(UseList); }
   typedef user_iterator_impl<User>       user_iterator;
   typedef user_iterator_impl<const User> const_user_iterator;
   user_iterator       user_begin()       { return user_iterator(UseList); }

diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index 25e7bc0fc40efbf482fa31eabac8b3ddd1da470f..8ecd70b5d716f52d715edfa7f079fcf7bc2f1653 100644 (file)
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -27,7 +27,7 @@ using namespace llvm;
 void llvm::FindFunctionBackedges(const Function &F,
      SmallVectorImpl<std::pair<const BasicBlock*,const BasicBlock*> > &Result) {
   const BasicBlock *BB = &F.getEntryBlock();
 void llvm::FindFunctionBackedges(const Function &F,
      SmallVectorImpl<std::pair<const BasicBlock*,const BasicBlock*> > &Result) {
   const BasicBlock *BB = &F.getEntryBlock();

-  if (succ_begin(BB) == succ_end(BB))
+  if (succ_empty(BB))

     return;
 
   SmallPtrSet<const BasicBlock*, 8> Visited;
     return;
 
   SmallPtrSet<const BasicBlock*, 8> Visited;

diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp
index e02b9e34fa695470641f8239bd9f4ad332e24d8b..4bf2d1a6dc6be17619d512bc9b83d746d75a9cc2 100644 (file)
--- a/lib/IR/Verifier.cpp
+++ b/lib/IR/Verifier.cpp
@@ -1128,7 +1128,7 @@ void Verifier::visitFunction(const Function &F) {
 
     // Check the entry node
     const BasicBlock *Entry = &F.getEntryBlock();
 
     // Check the entry node
     const BasicBlock *Entry = &F.getEntryBlock();

-    Assert1(pred_begin(Entry) == pred_end(Entry),
+    Assert1(pred_empty(Entry),

             "Entry block to function must not have predecessors!", Entry);
 
     // The address of the entry block cannot be taken, unless it is dead.
             "Entry block to function must not have predecessors!", Entry);
 
     // The address of the entry block cannot be taken, unless it is dead.

diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp
index b2c4a099b020b79d4de061988bfecbc3157cb0b0..7bd4ce12860d29a885051c596a7631c6ef54c70a 100644 (file)
--- a/lib/Transforms/IPO/PruneEH.cpp
+++ b/lib/Transforms/IPO/PruneEH.cpp
@@ -200,7 +200,7 @@ bool PruneEH::SimplifyFunction(Function *F) {
         BB->getInstList().pop_back();
 
         // If the unwind block is now dead, nuke it.
         BB->getInstList().pop_back();
 
         // If the unwind block is now dead, nuke it.

-        if (pred_begin(UnwindBlock) == pred_end(UnwindBlock))
+        if (pred_empty(UnwindBlock))

           DeleteBasicBlock(UnwindBlock);  // Delete the new BB.
 
         ++NumRemoved;
           DeleteBasicBlock(UnwindBlock);  // Delete the new BB.
 
         ++NumRemoved;


@@ -234,7 +234,7 @@ bool PruneEH::SimplifyFunction(Function *F) {
 /// updating the callgraph to reflect any now-obsolete edges due to calls that
 /// exist in the BB.
 void PruneEH::DeleteBasicBlock(BasicBlock *BB) {
 /// updating the callgraph to reflect any now-obsolete edges due to calls that
 /// exist in the BB.
 void PruneEH::DeleteBasicBlock(BasicBlock *BB) {

-  assert(pred_begin(BB) == pred_end(BB) && "BB is not dead!");
+  assert(pred_empty(BB) && "BB is not dead!");

   CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph();
 
   CallGraphNode *CGN = CG[BB->getParent()];
   CallGraph &CG = getAnalysis<CallGraphWrapperPass>().getCallGraph();
 
   CallGraphNode *CGN = CG[BB->getParent()];

diff --git a/lib/Transforms/Scalar/JumpThreading.cpp b/lib/Transforms/Scalar/JumpThreading.cpp
index 96bb2c8d191f759e1ce8182bae306e11016fe9d3..78beb3f98dcd1cca78ac86d452bcd0b983847394 100644 (file)
--- a/lib/Transforms/Scalar/JumpThreading.cpp
+++ b/lib/Transforms/Scalar/JumpThreading.cpp
@@ -188,7 +188,7 @@ bool JumpThreading::runOnFunction(Function &F) {
 
       // If the block is trivially dead, zap it.  This eliminates the successor
       // edges which simplifies the CFG.
 
       // If the block is trivially dead, zap it.  This eliminates the successor
       // edges which simplifies the CFG.

-      if (pred_begin(BB) == pred_end(BB) &&
+      if (pred_empty(BB) &&

           BB != &BB->getParent()->getEntryBlock()) {
         DEBUG(dbgs() << "  JT: Deleting dead block '" << BB->getName()
               << "' with terminator: " << *BB->getTerminator() << '\n');
           BB != &BB->getParent()->getEntryBlock()) {
         DEBUG(dbgs() << "  JT: Deleting dead block '" << BB->getName()
               << "' with terminator: " << *BB->getTerminator() << '\n');


@@ -662,7 +662,7 @@ static bool hasAddressTakenAndUsed(BasicBlock *BB) {
 bool JumpThreading::ProcessBlock(BasicBlock *BB) {
   // If the block is trivially dead, just return and let the caller nuke it.
   // This simplifies other transformations.
 bool JumpThreading::ProcessBlock(BasicBlock *BB) {
   // If the block is trivially dead, just return and let the caller nuke it.
   // This simplifies other transformations.

-  if (pred_begin(BB) == pred_end(BB) &&
+  if (pred_empty(BB) &&

       BB != &BB->getParent()->getEntryBlock())
     return false;
 
       BB != &BB->getParent()->getEntryBlock())
     return false;
 

diff --git a/lib/Transforms/Scalar/Reg2Mem.cpp b/lib/Transforms/Scalar/Reg2Mem.cpp
index b6023e2ce7897fcc9232b1ce53eef1e3626cdbf4..1b46727c17bb68bedc42c8355d3b582d46e87db6 100644 (file)
--- a/lib/Transforms/Scalar/Reg2Mem.cpp
+++ b/lib/Transforms/Scalar/Reg2Mem.cpp
@@ -73,7 +73,7 @@ bool RegToMem::runOnFunction(Function &F) {
 
   // Insert all new allocas into entry block.
   BasicBlock *BBEntry = &F.getEntryBlock();
 
   // Insert all new allocas into entry block.
   BasicBlock *BBEntry = &F.getEntryBlock();

-  assert(pred_begin(BBEntry) == pred_end(BBEntry) &&
+  assert(pred_empty(BBEntry) &&

          "Entry block to function must not have predecessors!");
 
   // Find first non-alloca instruction and create insertion point. This is
          "Entry block to function must not have predecessors!");
 
   // Find first non-alloca instruction and create insertion point. This is

diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index 50ebdb77158350a392056525e65586ad8b46d909..c8b6705ab5eab0747254851153fe4c25929565d5 100644 (file)
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -3020,7 +3020,7 @@ bool SimplifyCFGOpt::SimplifyReturn(ReturnInst *RI, IRBuilder<> &Builder) {
     }
 
     // If we eliminated all predecessors of the block, delete the block now.
     }
 
     // If we eliminated all predecessors of the block, delete the block now.

-    if (pred_begin(BB) == pred_end(BB))
+    if (pred_empty(BB))

       // We know there are no successors, so just nuke the block.
       BB->eraseFromParent();
 
       // We know there are no successors, so just nuke the block.
       BB->eraseFromParent();
 


@@ -3193,7 +3193,7 @@ bool SimplifyCFGOpt::SimplifyUnreachable(UnreachableInst *UI) {
   }
 
   // If this block is now dead, remove it.
   }
 
   // If this block is now dead, remove it.

-  if (pred_begin(BB) == pred_end(BB) &&
+  if (pred_empty(BB) &&

       BB != &BB->getParent()->getEntryBlock()) {
     // We know there are no successors, so just nuke the block.
     BB->eraseFromParent();
       BB != &BB->getParent()->getEntryBlock()) {
     // We know there are no successors, so just nuke the block.
     BB->eraseFromParent();


@@ -4587,7 +4587,7 @@ bool SimplifyCFGOpt::run(BasicBlock *BB) {
 
   // Remove basic blocks that have no predecessors (except the entry block)...
   // or that just have themself as a predecessor.  These are unreachable.
 
   // Remove basic blocks that have no predecessors (except the entry block)...
   // or that just have themself as a predecessor.  These are unreachable.

-  if ((pred_begin(BB) == pred_end(BB) &&
+  if ((pred_emtpy(BB) &&

        BB != &BB->getParent()->getEntryBlock()) ||
       BB->getSinglePredecessor() == BB) {
     DEBUG(dbgs() << "Removing BB: \n" << *BB);
        BB != &BB->getParent()->getEntryBlock()) ||
       BB->getSinglePredecessor() == BB) {
     DEBUG(dbgs() << "Removing BB: \n" << *BB);