[PATCH] D87078: [UnifyFunctionExitNodes] Remove unused getters, NFC

[David Stenberg via Phabricator via llvm-commits]

This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
dstenb marked 2 inline comments as done.
Closed by commit rG17dce2fe43c9: [UnifyFunctionExitNodes] Remove unused getters, NFC (authored by dstenb).

Changed prior to commit:
  https://reviews.llvm.org/D87078?vs=289664&id=290551#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D87078/new/

https://reviews.llvm.org/D87078

Files:
  llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
  llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp


Index: llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
===================================================================
--- llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
+++ llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
@@ -6,10 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This pass is used to ensure that functions have at most one return
-// instruction in them.  Additionally, it keeps track of which node is the new
-// exit node of the CFG.  If there are no exit nodes in the CFG, the getExitNode
-// method will return a null pointer.
+// This pass is used to ensure that functions have at most one return and one
+// unreachable instruction in them.
 //
 //===----------------------------------------------------------------------===//
 
@@ -61,12 +59,8 @@
       UnreachableBlocks.push_back(&I);
 
   // Then unreachable blocks.
-  if (UnreachableBlocks.empty()) {
-    UnreachableBlock = nullptr;
-  } else if (UnreachableBlocks.size() == 1) {
-    UnreachableBlock = UnreachableBlocks.front();
-  } else {
-    UnreachableBlock = BasicBlock::Create(F.getContext(),
+  if (UnreachableBlocks.size() > 1) {
+    BasicBlock *UnreachableBlock = BasicBlock::Create(F.getContext(),
                                           "UnifiedUnreachableBlock", &F);
     new UnreachableInst(F.getContext(), UnreachableBlock);
 
@@ -76,14 +70,9 @@
     }
   }
 
-  // Now handle return blocks.
-  if (ReturningBlocks.empty()) {
-    ReturnBlock = nullptr;
-    return false;                          // No blocks return
-  } else if (ReturningBlocks.size() == 1) {
-    ReturnBlock = ReturningBlocks.front(); // Already has a single return block
+  // There is nothing more to do if we do not have multiple return blocks.
+  if (ReturningBlocks.size() <= 1)
     return false;
-  }
 
   // Otherwise, we need to insert a new basic block into the function, add a PHI
   // nodes (if the function returns values), and convert all of the return
@@ -115,6 +104,5 @@
     BB->getInstList().pop_back();  // Remove the return insn
     BranchInst::Create(NewRetBlock, BB);
   }
-  ReturnBlock = NewRetBlock;
   return true;
 }
Index: llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
===================================================================
--- llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
+++ llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
@@ -7,10 +7,7 @@
 //===----------------------------------------------------------------------===//
 //
 // This pass is used to ensure that functions have at most one return and one
-// unwind instruction in them.  Additionally, it keeps track of which node is
-// the new exit node of the CFG.  If there are no return or unwind instructions
-// in the function, the getReturnBlock/getUnwindBlock methods will return a null
-// pointer.
+// unreachable instruction in them.
 //
 //===----------------------------------------------------------------------===//
 
@@ -24,10 +21,6 @@
 class BasicBlock;
 
 struct UnifyFunctionExitNodes : public FunctionPass {
-  BasicBlock *ReturnBlock = nullptr;
-  BasicBlock *UnwindBlock = nullptr;
-  BasicBlock *UnreachableBlock;
-
 public:
   static char ID; // Pass identification, replacement for typeid
   UnifyFunctionExitNodes();
@@ -35,13 +28,6 @@
   // We can preserve non-critical-edgeness when we unify function exit nodes
   void getAnalysisUsage(AnalysisUsage &AU) const override;
 
-  // getReturn|Unwind|UnreachableBlock - Return the new single (or nonexistent)
-  // return, unwind, or unreachable  basic blocks in the CFG.
-  //
-  BasicBlock *getReturnBlock() const { return ReturnBlock; }
-  BasicBlock *getUnwindBlock() const { return UnwindBlock; }
-  BasicBlock *getUnreachableBlock() const { return UnreachableBlock; }
-
   bool runOnFunction(Function &F) override;
 };
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D87078.290551.patch
Type: text/x-patch
Size: 3886 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200908/3e2b7921/attachment.bin>