summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Stoklund Olesen <stoklund@2pi.dk>2009-12-03 05:15:35 +0000
committerJakob Stoklund Olesen <stoklund@2pi.dk>2009-12-03 05:15:35 +0000
commit32042f9475a5b5ca474e3330f715fbbfdb095302 (patch)
treec6224f699374cbb4d89387f82d50a5197f9036f8
parent6048e7fdc0f6d69699081a9ab7a0a9be104b1d02 (diff)
downloadbcm5719-llvm-32042f9475a5b5ca474e3330f715fbbfdb095302.tar.gz
bcm5719-llvm-32042f9475a5b5ca474e3330f715fbbfdb095302.zip
Don't call getValueType() on a null SDValue
llvm-svn: 90415
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 06ffdd63881..64331b0fe26 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -546,7 +546,8 @@ SDValue DAGCombiner::CombineTo(SDNode *N, const SDValue *To, unsigned NumTo,
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);
OpenPOWER on IntegriCloud