[llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCISelLowering.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/PowerPC:

PPCISelLowering.cpp updated: 1.47 -> 1.48
---
Log message:

Fix Regression/CodeGen/PowerPC/2005-11-30-vastart-crash.ll


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

 PPCISelLowering.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/PowerPC/PPCISelLowering.cpp
diff -u llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.47 llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.48
--- llvm/lib/Target/PowerPC/PPCISelLowering.cpp:1.47	Tue Nov 29 02:17:20 2005
+++ llvm/lib/Target/PowerPC/PPCISelLowering.cpp	Wed Nov 30 14:40:54 2005
@@ -434,7 +434,8 @@
         needsLoad = true;
       }
       break;
-    case MVT::i64: ObjSize = 8;
+    case MVT::i64:
+      ObjSize = 8;
       if (!ArgLive) break;
       if (GPR_remaining > 0) {
         SDOperand argHi, argLo;
@@ -530,7 +531,10 @@
       SDOperand PtrOff = DAG.getConstant(4, getPointerTy());
       FIN = DAG.getNode(ISD::ADD, MVT::i32, FIN, PtrOff);
     }
-    DAG.setRoot(DAG.getNode(ISD::TokenFactor, MVT::Other, MemOps));
+    if (!MemOps.empty()) {
+      MemOps.push_back(DAG.getRoot());
+      DAG.setRoot(DAG.getNode(ISD::TokenFactor, MVT::Other, MemOps));
+    }
   }
   
   // Finally, inform the code generator which regs we return values in.