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

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

diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 0a35939ff82ec4c183e4caa2691352cdeeb6ed92..4e058640ff413df3f9771e41a212f8e6f2638327 100644 (file)
--- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -462,6 +462,7 @@ SDOperand DAGCombiner::visitTokenFactor(SDNode *N) {
     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 @@ SDOperand DAGCombiner::visitTRUNCATE(SDNode *N) {
                   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();