commit 6d8e6d5ee4ac9eddf19f34deb08785302f30837b
author Hans Wennborg <hans@hanshq.net> Thu Mar 05 03:24:49 2015 +0000
committer Hans Wennborg <hans@hanshq.net> Thu Mar 05 03:24:49 2015 +0000
tree 91c8f5f53137e084b4bd4c97b8435b661f40ed40
parent 7a715dae0552b8bc8597974720eaf8a68ec6f8fa

Revert r231324 "Remove the conditional addition of the execution dependency fixing"

See PR22799.

llvm-svn: 231348

llvm/lib/Target/ARM/ARMTargetMachine.cpp

diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
index e3e6228..34f7f78 100644
--- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
@@ -358,7 +358,9 @@
 void ARMPassConfig::addPreSched2() {
   if (getOptLevel() != CodeGenOpt::None) {
     addPass(createARMLoadStoreOptimizationPass());
-    addPass(createExecutionDependencyFixPass(&ARM::DPRRegClass));
+
+    if (getARMSubtarget().hasNEON())
+      addPass(createExecutionDependencyFixPass(&ARM::DPRRegClass));
   }
 
   // Expand some pseudo instructions into multiple instructions to allow