diff options
| -rw-r--r-- | llvm/include/llvm/DerivedTypes.h | 2 | ||||
| -rw-r--r-- | llvm/lib/VMCore/Verifier.cpp | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/llvm/include/llvm/DerivedTypes.h b/llvm/include/llvm/DerivedTypes.h index 3bc00e9bb25..24681a51f84 100644 --- a/llvm/include/llvm/DerivedTypes.h +++ b/llvm/include/llvm/DerivedTypes.h @@ -385,6 +385,8 @@ public: /// static VectorType *getTruncatedElementVectorType(const VectorType *VTy) { unsigned EltBits = VTy->getElementType()->getPrimitiveSizeInBits(); + assert((EltBits & 1) == 0 && + "Cannot truncate vector element with odd bit-width"); const Type *EltTy = IntegerType::get(EltBits / 2); return VectorType::get(EltTy, VTy->getNumElements()); } diff --git a/llvm/lib/VMCore/Verifier.cpp b/llvm/lib/VMCore/Verifier.cpp index 4a7915430ee..f9ad41b2c42 100644 --- a/llvm/lib/VMCore/Verifier.cpp +++ b/llvm/lib/VMCore/Verifier.cpp @@ -1395,16 +1395,22 @@ bool Verifier::PerformTypeCheck(Intrinsic::ID ID, Function *F, const Type *Ty, // type. if ((Match & (ExtendedElementVectorType | TruncatedElementVectorType)) != 0) { - if (!VTy) { + const IntegerType *IEltTy = dyn_cast<IntegerType>(EltTy); + if (!VTy || !IEltTy) { CheckFailed("Intrinsic parameter #" + utostr(ArgNo - 1) + " is not " - "a vector type.", F); + "an integral vector type.", F); return false; } // Adjust the current Ty (in the opposite direction) rather than // the type being matched against. - if ((Match & ExtendedElementVectorType) != 0) + if ((Match & ExtendedElementVectorType) != 0) { + if ((IEltTy->getBitWidth() & 1) != 0) { + CheckFailed("Intrinsic parameter #" + utostr(ArgNo - 1) + " vector " + "element bit-width is odd.", F); + return false; + } Ty = VectorType::getTruncatedElementVectorType(VTy); - else + } else Ty = VectorType::getExtendedElementVectorType(VTy); Match &= ~(ExtendedElementVectorType | TruncatedElementVectorType); } |
