X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FUtils%2FUnifyFunctionExitNodes.cpp;h=3c522b53ab03e1300210a2ba8dcd12256eb0140b;hb=dee430d26e14a3d7c8d86688d49ac8b116aa044f;hp=da7b1f609aea8f8ab610cff4237b219f4ad2cf7c;hpb=417cf7ef96ffcf81f5ca6c48639c804c2aa68bce;p=oota-llvm.git

diff --git a/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp b/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
index da7b1f609ae..3c522b53ab0 100644
--- a/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
+++ b/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
@@ -1,53 +1,55 @@
-//===- SimplifyCFG.cpp - CFG Simplification Routines -------------*- C++ -*--=//
+//===- UnifyFunctionExitNodes.cpp - Make all functions have a single exit -===//
 //
-// This file provides several routines that are useful for simplifying CFGs in
-// various ways...
+// 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.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Transforms/UnifyMethodExitNodes.h"
+#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
 #include "llvm/BasicBlock.h"
-#include "llvm/Method.h"
+#include "llvm/Function.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iPHINode.h"
 #include "llvm/Type.h"
 using std::vector;
 
-AnalysisID UnifyMethodExitNodes::ID(AnalysisID::create<UnifyMethodExitNodes>());
-
+static RegisterOpt<UnifyFunctionExitNodes>
+X("mergereturn", "Unify function exit nodes");
 
 // UnifyAllExitNodes - Unify all exit nodes of the CFG by creating a new
 // BasicBlock, and converting all returns to unconditional branches to this
 // new basic block.  The singular exit node is returned.
 //
-// If there are no return stmts in the Method, a null pointer is returned.
+// If there are no return stmts in the Function, a null pointer is returned.
 //
-bool UnifyMethodExitNodes::doit(Method *M, BasicBlock *&ExitNode) {
-  // Loop over all of the blocks in a method, tracking all of the blocks that
+bool UnifyFunctionExitNodes::runOnFunction(Function &F) {
+  // Loop over all of the blocks in a function, tracking all of the blocks that
   // return.
   //
   vector<BasicBlock*> ReturningBlocks;
-  for(Method::iterator I = M->begin(), E = M->end(); I != E; ++I)
-    if (isa<ReturnInst>((*I)->getTerminator()))
-      ReturningBlocks.push_back(*I);
+  for(Function::iterator I = F.begin(), E = F.end(); I != E; ++I)
+    if (isa<ReturnInst>(I->getTerminator()))
+      ReturningBlocks.push_back(I);
 
   if (ReturningBlocks.empty()) {
     ExitNode = 0;
-    return false;                      // No blocks return
+    return false;                          // No blocks return
   } else if (ReturningBlocks.size() == 1) {
     ExitNode = ReturningBlocks.front();    // Already has a single return block
     return false;
   }
 
-  // Otherwise, we need to insert a new basic block into the method, add a PHI
+  // Otherwise, we need to insert a new basic block into the function, add a PHI
   // node (if the function returns a value), and convert all of the return 
   // instructions into unconditional branches.
   //
-  BasicBlock *NewRetBlock = new BasicBlock("UnifiedExitNode", M);
+  BasicBlock *NewRetBlock = new BasicBlock("UnifiedExitNode", &F);
 
-  if (M->getReturnType() != Type::VoidTy) {
-    // If the method doesn't return void... add a PHI node to the block...
-    PHINode *PN = new PHINode(M->getReturnType());
+  if (F.getReturnType() != Type::VoidTy) {
+    // If the function doesn't return void... add a PHI node to the block...
+    PHINode *PN = new PHINode(F.getReturnType(), "UnifiedRetVal");
     NewRetBlock->getInstList().push_back(PN);
 
     // Add an incoming element to the PHI node for every return instruction that
@@ -68,7 +70,7 @@ bool UnifyMethodExitNodes::doit(Method *M, BasicBlock *&ExitNode) {
   //
   for (vector<BasicBlock*>::iterator I = ReturningBlocks.begin(), 
                                      E = ReturningBlocks.end(); I != E; ++I) {
-    delete (*I)->getInstList().pop_back();  // Remove the return insn
+    (*I)->getInstList().pop_back();  // Remove the return insn
     (*I)->getInstList().push_back(new BranchInst(NewRetBlock));
   }
   ExitNode = NewRetBlock;