Move -lowerselect later in the chain; some select instructions were

slipping through into the instruction selector, which can't deal with
them yet.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18758 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/Sparc/SparcTargetMachine.cpp b/lib/Target/Sparc/SparcTargetMachine.cpp
index 324fc5b1c95f1cda281d98302a0f4ea0890f462e..065dc2dfac5fa503d43b79e447b15856f6c2ed0a 100644 (file)
--- a/lib/Target/Sparc/SparcTargetMachine.cpp
+++ b/lib/Target/Sparc/SparcTargetMachine.cpp
@@ -65,9 +65,6 @@ bool SparcV8TargetMachine::addPassesToEmitAssembly(PassManager &PM,
   // Replace malloc and free instructions with library calls.
   PM.add(createLowerAllocationsPass());
 
-  // FIXME: implement the select instruction in the instruction selector.
-  PM.add(createLowerSelectPass());
-  
   // FIXME: implement the switch instruction in the instruction selector.
   PM.add(createLowerSwitchPass());
 
@@ -79,6 +76,9 @@ bool SparcV8TargetMachine::addPassesToEmitAssembly(PassManager &PM,
   // Make sure that no unreachable blocks are instruction selected.
   PM.add(createUnreachableBlockEliminationPass());
 
+  // FIXME: implement the select instruction in the instruction selector.
+  PM.add(createLowerSelectPass());
+  
   PM.add(createSparcV8SimpleInstructionSelector(*this));
 
   // Print machine instructions as they were initially generated.
@@ -118,9 +118,6 @@ void SparcV8JITInfo::addPassesToJITCompile(FunctionPassManager &PM) {
   // Replace malloc and free instructions with library calls.
   PM.add(createLowerAllocationsPass());
   
-  // FIXME: implement the select instruction in the instruction selector.
-  PM.add(createLowerSelectPass());
-  
   // FIXME: implement the switch instruction in the instruction selector.
   PM.add(createLowerSwitchPass());
 
@@ -132,6 +129,9 @@ void SparcV8JITInfo::addPassesToJITCompile(FunctionPassManager &PM) {
   // Make sure that no unreachable blocks are instruction selected.
   PM.add(createUnreachableBlockEliminationPass());
 
+  // FIXME: implement the select instruction in the instruction selector.
+  PM.add(createLowerSelectPass());
+  
   PM.add(createSparcV8SimpleInstructionSelector(TM));
 
   // Print machine instructions as they were initially generated.

diff --git a/lib/Target/SparcV8/SparcV8TargetMachine.cpp b/lib/Target/SparcV8/SparcV8TargetMachine.cpp
index 324fc5b1c95f1cda281d98302a0f4ea0890f462e..065dc2dfac5fa503d43b79e447b15856f6c2ed0a 100644 (file)
--- a/lib/Target/SparcV8/SparcV8TargetMachine.cpp
+++ b/lib/Target/SparcV8/SparcV8TargetMachine.cpp
@@ -65,9 +65,6 @@ bool SparcV8TargetMachine::addPassesToEmitAssembly(PassManager &PM,
   // Replace malloc and free instructions with library calls.
   PM.add(createLowerAllocationsPass());
 
-  // FIXME: implement the select instruction in the instruction selector.
-  PM.add(createLowerSelectPass());
-  
   // FIXME: implement the switch instruction in the instruction selector.
   PM.add(createLowerSwitchPass());
 
@@ -79,6 +76,9 @@ bool SparcV8TargetMachine::addPassesToEmitAssembly(PassManager &PM,
   // Make sure that no unreachable blocks are instruction selected.
   PM.add(createUnreachableBlockEliminationPass());
 
+  // FIXME: implement the select instruction in the instruction selector.
+  PM.add(createLowerSelectPass());
+  
   PM.add(createSparcV8SimpleInstructionSelector(*this));
 
   // Print machine instructions as they were initially generated.
@@ -118,9 +118,6 @@ void SparcV8JITInfo::addPassesToJITCompile(FunctionPassManager &PM) {
   // Replace malloc and free instructions with library calls.
   PM.add(createLowerAllocationsPass());
   
-  // FIXME: implement the select instruction in the instruction selector.
-  PM.add(createLowerSelectPass());
-  
   // FIXME: implement the switch instruction in the instruction selector.
   PM.add(createLowerSwitchPass());
 
@@ -132,6 +129,9 @@ void SparcV8JITInfo::addPassesToJITCompile(FunctionPassManager &PM) {
   // Make sure that no unreachable blocks are instruction selected.
   PM.add(createUnreachableBlockEliminationPass());
 
+  // FIXME: implement the select instruction in the instruction selector.
+  PM.add(createLowerSelectPass());
+  
   PM.add(createSparcV8SimpleInstructionSelector(TM));
 
   // Print machine instructions as they were initially generated.