diff options
author | Craig Topper <craig.topper@intel.com> | 2018-12-17 20:29:13 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@intel.com> | 2018-12-17 20:29:13 +0000 |
commit | 15b7246935ad656c916aedde5e16cfb67cf18921 (patch) | |
tree | 51530f90dc09c051a23d9a4ce41aeb870c8ce30a /llvm/lib/CodeGen/SelectionDAG | |
parent | 1a6e9ec434319fa0ce20678e14391cb1af0c949b (diff) | |
download | bcm5719-llvm-15b7246935ad656c916aedde5e16cfb67cf18921.tar.gz bcm5719-llvm-15b7246935ad656c916aedde5e16cfb67cf18921.zip |
[SelectionDAG] Fix noop detection for vectors in AssertZext/AssertSext in getNode
The assertion type is always supposed to be a scalar type. So if the result VT of the assertion is a vector, we need to get the scalar VT before we can compare them.
Similarly for the assert above it.
I don't have a test case because I don't know of any place we violate this today. A coworker found this while trying to use r347287 on the 6.0 branch without also having r336868
llvm-svn: 349390
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG')
-rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 6241af1332f..d69e50d9007 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -4842,8 +4842,8 @@ SDValue SelectionDAG::getNode(unsigned Opcode, const SDLoc &DL, EVT VT, assert(!EVT.isVector() && "AssertSExt/AssertZExt type should be the vector element type " "rather than the vector type!"); - assert(EVT.bitsLE(VT) && "Not extending!"); - if (VT == EVT) return N1; // noop assertion. + assert(EVT.bitsLE(VT.getScalarType()) && "Not extending!"); + if (VT.getScalarType() == EVT) return N1; // noop assertion. break; } case ISD::SIGN_EXTEND_INREG: { |