diff options
| author | James Molloy <james.molloy@arm.com> | 2012-09-10 14:01:21 +0000 |
|---|---|---|
| committer | James Molloy <james.molloy@arm.com> | 2012-09-10 14:01:21 +0000 |
| commit | 1e5c61181593114a34e3d5c61b8699a766c8f40f (patch) | |
| tree | 717714a78ed687265ca64a5001027742b7b115f6 /llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | |
| parent | ba9a03f279bc90550303f17d368817da7b2dd165 (diff) | |
| download | bcm5719-llvm-1e5c61181593114a34e3d5c61b8699a766c8f40f.tar.gz bcm5719-llvm-1e5c61181593114a34e3d5c61b8699a766c8f40f.zip | |
Fix an assertion failure when optimising a shufflevector incorrectly into concat_vectors, and a followup bug with SelectionDAG::getNode() creating nodes with invalid types.
llvm-svn: 163511
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 4caafa5b574..d7fa00962a6 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -8095,6 +8095,12 @@ SDValue DAGCombiner::visitBUILD_VECTOR(SDNode *N) { if (VecIn1.getValueType().getSizeInBits()*2 != VT.getSizeInBits()) return SDValue(); + // If the input vector type has a different base type to the output + // vector type, bail out. + if (VecIn1.getValueType().getVectorElementType() != + VT.getVectorElementType()) + return SDValue(); + // Widen the input vector by adding undef values. VecIn1 = DAG.getNode(ISD::CONCAT_VECTORS, N->getDebugLoc(), VT, VecIn1, DAG.getUNDEF(VecIn1.getValueType())); |
