[llvm-commits] [llvm] r150567 - /llvm/trunk/lib/CodeGen/Passes.cpp

[Andrew Trick]

Author: atrick
Date: Tue Feb 14 23:43:27 2012
New Revision: 150567

URL: http://llvm.org/viewvc/llvm-project?rev=150567&view=rev
Log:
Reapply r150565 with the typo fix properly merged.

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

Modified: llvm/trunk/lib/CodeGen/Passes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/Passes.cpp?rev=150567&r1=150566&r2=150567&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/Passes.cpp (original)
+++ llvm/trunk/lib/CodeGen/Passes.cpp Tue Feb 14 23:43:27 2012
@@ -582,14 +582,8 @@
   //
   // FIXME: Re-enable coloring with register when it's capable of adding
   // kill markers.
-  addPass(StackSlotColoringID);
-
-  // Run post-ra machine LICM to hoist reloads / remats.
-  //
-  // FIXME: can this move into MachineLateOptimization?
-  addPass(PostRAMachineLICMID);
-
-  printAndVerify("After StackSlotColoring and postra Machine LICM");
+  if (addPass(StackSlotColoringID) != &NoPassID)
+    printAndVerify("After StackSlotColoring");
 }
 
 //===---------------------------------------------------------------------===//
@@ -598,6 +592,10 @@
 
 /// Add passes that optimize machine instructions after register allocation.
 void TargetPassConfig::addMachineLateOptimization() {
+  // Run post-ra machine LICM to hoist reloads / remats.
+  if (addPass(PostRAMachineLICMID) != &NoPassID)
+    printAndVerify("After postra Machine LICM");
+
   // Branch folding must be run after regalloc and prolog/epilog insertion.
   if (addPass(BranchFolderPassID) != &NoPassID)
     printNoVerify("After BranchFolding");