[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.38 -> 1.39
---
Log message:

Fix the trunc(load) case, finally allowing crafty and povray to pass


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

 DAGCombiner.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.38 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.39
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.38	Thu Oct 13 16:52:31 2005
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Thu Oct 13 17:10:05 2005
@@ -462,6 +462,7 @@
     if (N->getOperand(1).getOpcode() == ISD::EntryToken)
       return N->getOperand(0);
   }
+  
   // fold (tokenfactor (tokenfactor)) -> tokenfactor
   for (unsigned i = 0, e = N->getNumOperands(); i != e; ++i) {
     SDOperand Op = N->getOperand(i);
@@ -1386,8 +1387,8 @@
                   DAG.getConstant(PtrOff, PtrType));
     WorkList.push_back(NewPtr.Val);
     SDOperand Load = DAG.getLoad(VT, N0.getOperand(0), NewPtr,N0.getOperand(2));
-    CombineTo(N0.Val, Load, Load.getOperand(0));
     WorkList.push_back(N);
+    CombineTo(N0.Val, Load, Load.getValue(1));
     return SDOperand();
   }
   return SDOperand();