[llvm-commits] [llvm] r90415 - /llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Wed Dec  2 23:15:35 2009
New Revision: 90415

URL: http://llvm.org/viewvc/llvm-project?rev=90415&view=rev
Log:
Don't call getValueType() on a null SDValue

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=90415&r1=90414&r2=90415&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Wed Dec  2 23:15:35 2009
@@ -546,7 +546,8 @@
         To[0].getNode()->dump(&DAG);
         errs() << " and " << NumTo-1 << " other values\n";
         for (unsigned i = 0, e = NumTo; i != e; ++i)
-          assert(N->getValueType(i) == To[i].getValueType() &&
+          assert((!To[i].getNode() ||
+                  N->getValueType(i) == To[i].getValueType()) &&
                  "Cannot combine value to value of different type!"));
   WorkListRemover DeadNodes(*this);
   DAG.ReplaceAllUsesWith(N, To, &DeadNodes);