[llvm] r179355 - Don't disable block layout when forcing block alignment.

[Nadav Rotem]

Author: nadav
Date: Thu Apr 11 20:24:16 2013
New Revision: 179355

URL: http://llvm.org/viewvc/llvm-project?rev=179355&view=rev
Log:
Don't disable block layout when forcing block alignment.


Modified:
    llvm/trunk/lib/CodeGen/MachineBlockPlacement.cpp

Modified: llvm/trunk/lib/CodeGen/MachineBlockPlacement.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineBlockPlacement.cpp?rev=179355&r1=179354&r2=179355&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineBlockPlacement.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineBlockPlacement.cpp Thu Apr 11 20:24:16 2013
@@ -1089,19 +1089,17 @@ bool MachineBlockPlacement::runOnMachine
   TLI = F.getTarget().getTargetLowering();
   assert(BlockToChain.empty());
 
-  if (AlignAllBlock) {
-    // Align all of the blocks in the function to a specific alignment.
-    for (MachineFunction::iterator FI = F.begin(), FE = F.end();
-         FI != FE; ++FI)
-      FI->setAlignment(AlignAllBlock);
-    return true;
-  }
-
   buildCFGChains(F);
 
   BlockToChain.clear();
   ChainAllocator.DestroyAll();
 
+  if (AlignAllBlock)
+    // Align all of the blocks in the function to a specific alignment.
+    for (MachineFunction::iterator FI = F.begin(), FE = F.end();
+         FI != FE; ++FI)
+      FI->setAlignment(AlignAllBlock);
+
   // We always return true as we have no way to track whether the final order
   // differs from the original order.
   return true;