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

[Chris Lattner]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.181 -> 1.182
---
Log message:

change internal impl of dag combiner so that calls to CombineTo never have to
make a temporary vector.


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

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


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.181 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.182
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.181	Fri Aug 11 12:46:28 2006
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Fri Aug 11 12:56:38 2006
@@ -75,16 +75,17 @@
       WorkList.push_back(N);
     }
     
-    SDOperand CombineTo(SDNode *N, const std::vector<SDOperand> &To) {
+    SDOperand CombineTo(SDNode *N, const SDOperand *To, unsigned NumTo) {
+      assert(N->getNumValues() == NumTo && "Broken CombineTo call!");
       ++NodesCombined;
       DEBUG(std::cerr << "\nReplacing "; N->dump();
             std::cerr << "\nWith: "; To[0].Val->dump(&DAG);
-            std::cerr << " and " << To.size()-1 << " other values\n");
+            std::cerr << " and " << NumTo-1 << " other values\n");
       std::vector<SDNode*> NowDead;
-      DAG.ReplaceAllUsesWith(N, &To[0], &NowDead);
+      DAG.ReplaceAllUsesWith(N, To, &NowDead);
       
       // Push the new nodes and any users onto the worklist
-      for (unsigned i = 0, e = To.size(); i != e; ++i) {
+      for (unsigned i = 0, e = NumTo; i != e; ++i) {
         WorkList.push_back(To[i].Val);
         AddUsersToWorkList(To[i].Val);
       }
@@ -101,16 +102,12 @@
     }
     
     SDOperand CombineTo(SDNode *N, SDOperand Res) {
-      std::vector<SDOperand> To;
-      To.push_back(Res);
-      return CombineTo(N, To);
+      return CombineTo(N, &Res, 1);
     }
     
     SDOperand CombineTo(SDNode *N, SDOperand Res0, SDOperand Res1) {
-      std::vector<SDOperand> To;
-      To.push_back(Res0);
-      To.push_back(Res1);
-      return CombineTo(N, To);
+      SDOperand To[] = { Res0, Res1 };
+      return CombineTo(N, To, 2);
     }
   private:    
     
@@ -253,7 +250,7 @@
 
 SDOperand TargetLowering::DAGCombinerInfo::
 CombineTo(SDNode *N, const std::vector<SDOperand> &To) {
-  return ((DAGCombiner*)DC)->CombineTo(N, To);
+  return ((DAGCombiner*)DC)->CombineTo(N, &To[0], To.size());
 }
 
 SDOperand TargetLowering::DAGCombinerInfo::