[llvm-commits] CVS: llvm/lib/Target/IA64/IA64ISelLowering.cpp

[Duraid Madina]

Changes in directory llvm/lib/Target/IA64:

IA64ISelLowering.cpp updated: 1.17 -> 1.18
---
Log message:

sabre's (correct) fix means these guys need to be flagged as well (else
the scheduler will complain)



---
Diffs of the changes:  (+7 -2)

 IA64ISelLowering.cpp |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/IA64/IA64ISelLowering.cpp
diff -u llvm/lib/Target/IA64/IA64ISelLowering.cpp:1.17 llvm/lib/Target/IA64/IA64ISelLowering.cpp:1.18
--- llvm/lib/Target/IA64/IA64ISelLowering.cpp:1.17	Wed Jan 11 19:33:08 2006
+++ llvm/lib/Target/IA64/IA64ISelLowering.cpp	Wed Jan 11 21:28:40 2006
@@ -392,11 +392,12 @@
   // know this is required (i.e. for varardic or external (unknown) functions)
 
   // first to the FP->(integer representation) conversions, these are
-  // free-floating
+  // flagged for now, but shouldn't have to be (TODO)
   unsigned seenConverts = 0;
   for (unsigned i = 0, e = RegValuesToPass.size(); i != e; ++i) {
     if(MVT::isFloatingPoint(RegValuesToPass[i].getValueType())) {
-      Chain = DAG.getCopyToReg(Chain, IntArgRegs[i], Converts[seenConverts++]);
+      Chain = DAG.getCopyToReg(Chain, IntArgRegs[i], Converts[seenConverts++], InFlag);
+      InFlag = Chain.getValue(1);
     }
   }
 
@@ -428,6 +429,8 @@
   // emit the call itself
   if (InFlag.Val)
     CallOperands.push_back(InFlag);
+  else
+    assert(0 && "this should never happen!\n");
 
 /* out with the old...
     Chain = SDOperand(DAG.getCall(NodeTys, Chain, Callee, InFlag), 0);
@@ -480,10 +483,12 @@
     case MVT::i64:
       RetVal = DAG.getCopyFromReg(Chain, IA64::r8, MVT::i64, InFlag);
       Chain = RetVal.getValue(1);
+      InFlag = RetVal.getValue(2); // XXX dead
       break;
     case MVT::f64:
       RetVal = DAG.getCopyFromReg(Chain, IA64::F8, MVT::f64, InFlag);
       Chain = RetVal.getValue(1);
+      InFlag = RetVal.getValue(2); // XXX dead
       break;
     }
   }