diff options
| author | Eric Christopher <echristo@apple.com> | 2010-11-11 20:50:14 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2010-11-11 20:50:14 +0000 |
| commit | 79ab2fe01a39a2fffe4e901ef3c96b6b943412a0 (patch) | |
| tree | 2631b9a7c417f606cac8b6d9aad15357965a0bd8 | |
| parent | 3c3849297bd9b4aedbac52417061e1da779cc412 (diff) | |
Revert the accidental commit I made reverting the previous commit.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118835 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/ARM/ARMTargetMachine.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp index d15963986c..81279d257c 100644 --- a/lib/Target/ARM/ARMTargetMachine.cpp +++ b/lib/Target/ARM/ARMTargetMachine.cpp @@ -148,7 +148,7 @@ bool ARMBaseTargetMachine::addInstSelector(PassManagerBase &PM, 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::addPreRegAlloc(PassManagerBase &PM, 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. |