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

[Nate Begeman]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.162 -> 1.163
---
Log message:

Fix PR772: http://llvm.cs.uiuc.edu/PR772 


---
Diffs of the changes:  (+9 -9)

 DAGCombiner.cpp |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.162 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.163
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.162	Sat May  6 18:06:26 2006
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Sun May  7 20:35:01 2006
@@ -1821,9 +1821,9 @@
   // fold (sext ( extload x)) -> (sext (truncate (sextload x)))
   if ((N0.getOpcode() == ISD::SEXTLOAD || N0.getOpcode() == ISD::EXTLOAD) &&
       N0.hasOneUse()) {
-    SDOperand ExtLoad = DAG.getNode(ISD::SEXTLOAD, VT, N0.getOperand(0),
-                                    N0.getOperand(1), N0.getOperand(2),
-                                    N0.getOperand(3));
+    MVT::ValueType EVT = cast<VTSDNode>(N0.getOperand(3))->getVT();
+    SDOperand ExtLoad = DAG.getExtLoad(ISD::SEXTLOAD, VT, N0.getOperand(0),
+                                       N0.getOperand(1), N0.getOperand(2), EVT);
     CombineTo(N, ExtLoad);
     CombineTo(N0.Val, DAG.getNode(ISD::TRUNCATE, N0.getValueType(), ExtLoad),
               ExtLoad.getValue(1));
@@ -1864,9 +1864,9 @@
   // fold (zext ( extload x)) -> (zext (truncate (zextload x)))
   if ((N0.getOpcode() == ISD::ZEXTLOAD || N0.getOpcode() == ISD::EXTLOAD) &&
       N0.hasOneUse()) {
-    SDOperand ExtLoad = DAG.getNode(ISD::ZEXTLOAD, VT, N0.getOperand(0),
-                                    N0.getOperand(1), N0.getOperand(2),
-                                    N0.getOperand(3));
+    MVT::ValueType EVT = cast<VTSDNode>(N0.getOperand(3))->getVT();
+    SDOperand ExtLoad = DAG.getExtLoad(ISD::ZEXTLOAD, VT, N0.getOperand(0),
+                                       N0.getOperand(1), N0.getOperand(2), EVT);
     CombineTo(N, ExtLoad);
     CombineTo(N0.Val, DAG.getNode(ISD::TRUNCATE, N0.getValueType(), ExtLoad),
               ExtLoad.getValue(1));
@@ -1911,9 +1911,9 @@
   if ((N0.getOpcode() == ISD::ZEXTLOAD || N0.getOpcode() == ISD::EXTLOAD ||
        N0.getOpcode() == ISD::SEXTLOAD) &&
       N0.hasOneUse()) {
-    SDOperand ExtLoad = DAG.getNode(N0.getOpcode(), VT, N0.getOperand(0),
-                                    N0.getOperand(1), N0.getOperand(2),
-                                    N0.getOperand(3));
+    MVT::ValueType EVT = cast<VTSDNode>(N0.getOperand(3))->getVT();
+    SDOperand ExtLoad = DAG.getExtLoad(N0.getOpcode(), VT, N0.getOperand(0),
+                                       N0.getOperand(1), N0.getOperand(2), EVT);
     CombineTo(N, ExtLoad);
     CombineTo(N0.Val, DAG.getNode(ISD::TRUNCATE, N0.getValueType(), ExtLoad),
               ExtLoad.getValue(1));