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

[Chris Lattner]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.122 -> 1.123
---
Log message:

Reinstate this now that the offending opposite xform has been removed.


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

 DAGCombiner.cpp |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.122 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.123
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.122	Sun Mar  5 01:30:16 2006
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Sun Mar  5 13:53:55 2006
@@ -1454,6 +1454,13 @@
   if (N1C && N0.getOpcode() == ISD::SRA && N1 == N0.getOperand(1))
     return DAG.getNode(ISD::AND, VT, N0.getOperand(0),
                        DAG.getConstant(~0ULL << N1C->getValue(), VT));
+  // fold (shl (add x, c1), c2) -> (add (shl x, c2), c1<<c2)
+  if (N1C && N0.getOpcode() == ISD::ADD && N0.Val->hasOneUse() && 
+      isa<ConstantSDNode>(N0.getOperand(1))) {
+    return DAG.getNode(ISD::ADD, VT, 
+                       DAG.getNode(ISD::SHL, VT, N0.getOperand(0), N1),
+                       DAG.getNode(ISD::SHL, VT, N0.getOperand(1), N1));
+  }
   return SDOperand();
 }