[llvm-branch-commits] [llvm-branch] r91354 - in /llvm/branches/Apple/Zoidberg: include/llvm/CodeGen/DAGISelHeader.h lib/CodeGen/SelectionDAG/SelectionDAG.cpp

[Bill Wendling]

Author: void
Date: Mon Dec 14 16:55:48 2009
New Revision: 91354

URL: http://llvm.org/viewvc/llvm-project?rev=91354&view=rev
Log:
$ svn merge -c 91233 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r91233 into '.':
U    include/llvm/CodeGen/DAGISelHeader.h
U    lib/CodeGen/SelectionDAG/SelectionDAG.cpp


Modified:
    llvm/branches/Apple/Zoidberg/include/llvm/CodeGen/DAGISelHeader.h
    llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

Modified: llvm/branches/Apple/Zoidberg/include/llvm/CodeGen/DAGISelHeader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/include/llvm/CodeGen/DAGISelHeader.h?rev=91354&r1=91353&r2=91354&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/include/llvm/CodeGen/DAGISelHeader.h (original)
+++ llvm/branches/Apple/Zoidberg/include/llvm/CodeGen/DAGISelHeader.h Mon Dec 14 16:55:48 2009
@@ -110,8 +110,7 @@
     DAG.setSubgraphColor(Node, "red");
 #endif
     SDNode *ResNode = Select(SDValue(Node, 0));
-    // If node should not be replaced, 
-    // continue with the next one.
+    // If node should not be replaced, continue with the next one.
     if (ResNode == Node)
       continue;
     // Replace node.

Modified: llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/SelectionDAG.cpp?rev=91354&r1=91353&r2=91354&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/SelectionDAG.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Mon Dec 14 16:55:48 2009
@@ -4167,7 +4167,7 @@
                           I->VTs[2] == VT3 && I->VTs[3] == VT4)
       return *I;
 
-  EVT *Array = Allocator.Allocate<EVT>(3);
+  EVT *Array = Allocator.Allocate<EVT>(4);
   Array[0] = VT1;
   Array[1] = VT2;
   Array[2] = VT3;