[llvm] r258421 - Partially revert "Add command line options to force function/loop alignments."

[Chad Rosier via llvm-commits]

Author: mcrosier
Date: Thu Jan 21 12:49:15 2016
New Revision: 258421

URL: http://llvm.org/viewvc/llvm-project?rev=258421&view=rev
Log:
Partially revert "Add command line options to force function/loop alignments."

This partially reverts r256571 in favor of the solution in r258409.

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=258421&r1=258420&r2=258421&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineBlockPlacement.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineBlockPlacement.cpp Thu Jan 21 12:49:15 2016
@@ -69,11 +69,6 @@ static cl::opt<unsigned> AlignAllNonFall
              "nops that are executed)."),
     cl::init(0), cl::Hidden);
 
-static cl::opt<unsigned>
-    AlignAllLoops("align-all-loops",
-                  cl::desc("Force the alignment of all loops in the function."),
-                  cl::init(0), cl::Hidden);
-
 // FIXME: Find a good default for this flag and remove the flag.
 static cl::opt<unsigned> ExitBlockBias(
     "block-placement-exit-block-bias",
@@ -1341,11 +1336,6 @@ void MachineBlockPlacement::buildCFGChai
     if (!L)
       continue;
 
-    if (AlignAllLoops) {
-      ChainBB->setAlignment(AlignAllLoops);
-      continue;
-    }
-
     unsigned Align = TLI->getPrefLoopAlignment(L);
     if (!Align)
       continue; // Don't care about loop alignment.