[llvm] r277864 - [FlattenCFG] Simplify + remove unused variable. NFCI.

[Davide Italiano via llvm-commits]

Author: davide
Date: Fri Aug  5 15:53:35 2016
New Revision: 277864

URL: http://llvm.org/viewvc/llvm-project?rev=277864&view=rev
Log:
[FlattenCFG] Simplify + remove unused variable. NFCI.

Modified:
    llvm/trunk/lib/Transforms/Utils/FlattenCFG.cpp

Modified: llvm/trunk/lib/Transforms/Utils/FlattenCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/FlattenCFG.cpp?rev=277864&r1=277863&r2=277864&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/FlattenCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/FlattenCFG.cpp Fri Aug  5 15:53:35 2016
@@ -463,19 +463,14 @@ bool FlattenCFGOpt::MergeIfRegion(BasicB
 }
 
 bool FlattenCFGOpt::run(BasicBlock *BB) {
-  bool Changed = false;
   assert(BB && BB->getParent() && "Block not embedded in function!");
   assert(BB->getTerminator() && "Degenerate basic block encountered!");
 
   IRBuilder<> Builder(BB);
 
-  if (FlattenParallelAndOr(BB, Builder))
+  if (FlattenParallelAndOr(BB, Builder) || MergeIfRegion(BB, Builder))
     return true;
-
-  if (MergeIfRegion(BB, Builder))
-    return true;
-
-  return Changed;
+  return false;
 }
 
 /// FlattenCFG - This function is used to flatten a CFG.  For