General cleanup

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

diff --git a/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp b/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
index 15e37e399335bff3811d56a64f833ac3d9f1a5de..da7b1f609aea8f8ab610cff4237b219f4ad2cf7c 100644 (file)
--- a/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
+++ b/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
@@ -23,16 +23,15 @@ AnalysisID UnifyMethodExitNodes::ID(AnalysisID::create<UnifyMethodExitNodes>());
 // If there are no return stmts in the Method, a null pointer is returned.
 //
 bool UnifyMethodExitNodes::doit(Method *M, BasicBlock *&ExitNode) {
-  vector<BasicBlock*> ReturningBlocks;
-
   // Loop over all of the blocks in a method, tracking all of the blocks that
   // return.
   //
+  vector<BasicBlock*> ReturningBlocks;
   for(Method::iterator I = M->begin(), E = M->end(); I != E; ++I)
-    if ((*I)->getTerminator()->getOpcode() == Instruction::Ret)
+    if (isa<ReturnInst>((*I)->getTerminator()))
       ReturningBlocks.push_back(*I);
 
-  if (ReturningBlocks.size() == 0) {
+  if (ReturningBlocks.empty()) {
     ExitNode = 0;
     return false;                      // No blocks return
   } else if (ReturningBlocks.size() == 1) {