Duncan pointed out that the Extended case in getTypeForMVT could

[oota-llvm.git] / lib / VMCore / ValueTypes.cpp

diff --git a/lib/VMCore/ValueTypes.cpp b/lib/VMCore/ValueTypes.cpp
index 99dc1de247e103276510a0684a067e2367c2d1ff..0229f155bc97b78ae986d5c3441780d161acb0ee 100644 (file)
--- a/lib/VMCore/ValueTypes.cpp
+++ b/lib/VMCore/ValueTypes.cpp
@@ -20,12 +20,14 @@ using namespace llvm;
 MVT MVT::getExtendedIntegerVT(unsigned BitWidth) {
   MVT VT;
   VT.LLVMTy = IntegerType::get(BitWidth);
+  assert(VT.isExtended() && "Type is not extended!");
   return VT;
 }
 
 MVT MVT::getExtendedVectorVT(MVT VT, unsigned NumElements) {
   MVT ResultVT;
   ResultVT.LLVMTy = VectorType::get(VT.getTypeForMVT(), NumElements);
+  assert(ResultVT.isExtended() && "Type is not extended!");
   return ResultVT;
 }
 
@@ -69,6 +71,7 @@ unsigned MVT::getExtendedSizeInBits() const {
   if (const VectorType *VTy = dyn_cast<VectorType>(LLVMTy))
     return VTy->getBitWidth();
   assert(false && "Unrecognized extended type!");
+  return 0; // Suppress warnings.
 }
 
 /// getMVTString - This function returns value type as a string, e.g. "i32".
@@ -118,13 +121,8 @@ std::string MVT::getMVTString() const {
 const Type *MVT::getTypeForMVT() const {
   switch (V) {
   default:
-    if (isVector())
-      return VectorType::get(getVectorElementType().getTypeForMVT(),
-                             getVectorNumElements());
-    if (isInteger())
-      return IntegerType::get(getSizeInBits());
-    assert(0 && "MVT does not correspond to LLVM type!");
-    return Type::VoidTy;
+    assert(isExtended() && "Type is not extended!");
+    return LLVMTy;
   case MVT::isVoid:  return Type::VoidTy;
   case MVT::i1:      return Type::Int1Ty;
   case MVT::i8:      return Type::Int8Ty;