Insert phi code at top of block

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

diff --git a/lib/Target/X86/InstSelectSimple.cpp b/lib/Target/X86/InstSelectSimple.cpp
index 4cb6562211da599683df95e963dd890517cbb277..cad8e0d912f1bb1b898769dcf5d9b088a6c24f57 100644 (file)
--- a/lib/Target/X86/InstSelectSimple.cpp
+++ b/lib/Target/X86/InstSelectSimple.cpp
@@ -340,9 +340,12 @@ void ISel::SelectPHINodes() {
         // Get the incoming value into a virtual register.  If it is not already
         // available in a virtual register, insert the computation code into
         // PredMBB
-        MachineBasicBlock::iterator PI = PredMBB->end()-1;
+        //
+
+        MachineBasicBlock::iterator PI = PredMBB->begin();
+        while ((*PI)->getOpcode() == X86::PHI) ++PI;
+        
         MI->addRegOperand(getReg(PN->getIncomingValue(i), PredMBB, PI));
-                                 
 
         // FIXME: Pass in the MachineBasicBlocks instead of the basic blocks...
         MI->addPCDispOperand(PN->getIncomingBlock(i));  // PredMBB

diff --git a/lib/Target/X86/X86ISelSimple.cpp b/lib/Target/X86/X86ISelSimple.cpp
index 4cb6562211da599683df95e963dd890517cbb277..cad8e0d912f1bb1b898769dcf5d9b088a6c24f57 100644 (file)
--- a/lib/Target/X86/X86ISelSimple.cpp
+++ b/lib/Target/X86/X86ISelSimple.cpp
@@ -340,9 +340,12 @@ void ISel::SelectPHINodes() {
         // Get the incoming value into a virtual register.  If it is not already
         // available in a virtual register, insert the computation code into
         // PredMBB
-        MachineBasicBlock::iterator PI = PredMBB->end()-1;
+        //
+
+        MachineBasicBlock::iterator PI = PredMBB->begin();
+        while ((*PI)->getOpcode() == X86::PHI) ++PI;
+        
         MI->addRegOperand(getReg(PN->getIncomingValue(i), PredMBB, PI));
-                                 
 
         // FIXME: Pass in the MachineBasicBlocks instead of the basic blocks...
         MI->addPCDispOperand(PN->getIncomingBlock(i));  // PredMBB