[llvm-commits] [llvm] r118835 - /llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp

[Eric Christopher]

Author: echristo
Date: Thu Nov 11 14:50:14 2010
New Revision: 118835

URL: http://llvm.org/viewvc/llvm-project?rev=118835&view=rev
Log:
Revert the accidental commit I made reverting the previous commit.

Modified:
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=118835&r1=118834&r2=118835&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Thu Nov 11 14:50:14 2010
@@ -148,7 +148,7 @@
 bool ARMBaseTargetMachine::addPreRegAlloc(PassManagerBase &PM,
                                           CodeGenOpt::Level OptLevel) {
   // FIXME: temporarily disabling load / store optimization pass for Thumb1.
-  if (!Subtarget.isThumb1Only())
+  if (OptLevel != CodeGenOpt::None && !Subtarget.isThumb1Only())
     PM.add(createARMLoadStoreOptimizationPass(true));
 
   return true;
@@ -157,11 +157,12 @@
 bool ARMBaseTargetMachine::addPreSched2(PassManagerBase &PM,
                                         CodeGenOpt::Level OptLevel) {
   // FIXME: temporarily disabling load / store optimization pass for Thumb1.
-  if (!Subtarget.isThumb1Only())
-    PM.add(createARMLoadStoreOptimizationPass());
-  
-  if (OptLevel != CodeGenOpt::None && Subtarget.hasNEON())
-    PM.add(createNEONMoveFixPass());
+  if (OptLevel != CodeGenOpt::None) {
+    if (!Subtarget.isThumb1Only())
+      PM.add(createARMLoadStoreOptimizationPass());
+    if (Subtarget.hasNEON())
+      PM.add(createNEONMoveFixPass());
+  }
 
   // Expand some pseudo instructions into multiple instructions to allow
   // proper scheduling.