Update llvm to r84119.

1 files changed, 13 insertions, 32 deletions

diff --git a/utils/TableGen/TGValueTypes.cpp b/utils/TableGen/TGValueTypes.cpp
index e4edca6..122d085 100644
--- a/utils/TableGen/TGValueTypes.cpp
+++ b/utils/TableGen/TGValueTypes.cpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// The MVT type is used by tablegen as well as in LLVM. In order to handle
-// extended types, the MVT type uses support functions that call into
+// The EVT type is used by tablegen as well as in LLVM. In order to handle
+// extended types, the EVT type uses support functions that call into
 // LLVM's type system code. These aren't accessible in tablegen, so this
 // file provides simple replacements.
 //
@@ -43,15 +43,15 @@ public:
 };
 
 class ExtendedVectorType : public Type {
-  MVT ElementType;
+  EVT ElementType;
   unsigned NumElements;
 public:
-  ExtendedVectorType(MVT elty, unsigned num)
+  ExtendedVectorType(EVT elty, unsigned num)
     : ElementType(elty), NumElements(num) {}
   unsigned getSizeInBits() const {
     return getNumElements() * getElementType().getSizeInBits();
   }
-  MVT getElementType() const {
+  EVT getElementType() const {
     return ElementType;
   }
   unsigned getNumElements() const {
@@ -64,62 +64,43 @@ static std::map<unsigned, const Type *>
 static std::map<std::pair<uintptr_t, uintptr_t>, const Type *>
   ExtendedVectorTypeMap;
 
-MVT MVT::getExtendedIntegerVT(unsigned BitWidth) {
-  const Type *&ET = ExtendedIntegerTypeMap[BitWidth];
-  if (!ET) ET = new ExtendedIntegerType(BitWidth);
-  MVT VT;
-  VT.LLVMTy = ET;
-  assert(VT.isExtended() && "Type is not extended!");
-  return VT;
-}
-
-MVT MVT::getExtendedVectorVT(MVT VT, unsigned NumElements) {
-  const Type *&ET = ExtendedVectorTypeMap[std::make_pair(VT.getRawBits(),
-                                                         NumElements)];
-  if (!ET) ET = new ExtendedVectorType(VT, NumElements);
-  MVT ResultVT;
-  ResultVT.LLVMTy = ET;
-  assert(ResultVT.isExtended() && "Type is not extended!");
-  return ResultVT;
-}
-
-bool MVT::isExtendedFloatingPoint() const {
+bool EVT::isExtendedFloatingPoint() const {
   assert(isExtended() && "Type is not extended!");
   // Extended floating-point types are not supported yet.
   return false;
 }
 
-bool MVT::isExtendedInteger() const {
+bool EVT::isExtendedInteger() const {
   assert(isExtended() && "Type is not extended!");
   return dynamic_cast<const ExtendedIntegerType *>(LLVMTy) != 0;
 }
 
-bool MVT::isExtendedVector() const {
+bool EVT::isExtendedVector() const {
   assert(isExtended() && "Type is not extended!");
   return dynamic_cast<const ExtendedVectorType *>(LLVMTy) != 0;
 }
 
-bool MVT::isExtended64BitVector() const {
+bool EVT::isExtended64BitVector() const {
   assert(isExtended() && "Type is not extended!");
   return isExtendedVector() && getSizeInBits() == 64;
 }
 
-bool MVT::isExtended128BitVector() const {
+bool EVT::isExtended128BitVector() const {
   assert(isExtended() && "Type is not extended!");
   return isExtendedVector() && getSizeInBits() == 128;
 }
 
-MVT MVT::getExtendedVectorElementType() const {
+EVT EVT::getExtendedVectorElementType() const {
   assert(isExtendedVector() && "Type is not an extended vector!");
   return static_cast<const ExtendedVectorType *>(LLVMTy)->getElementType();
 }
 
-unsigned MVT::getExtendedVectorNumElements() const {
+unsigned EVT::getExtendedVectorNumElements() const {
   assert(isExtendedVector() && "Type is not an extended vector!");
   return static_cast<const ExtendedVectorType *>(LLVMTy)->getNumElements();
 }
 
-unsigned MVT::getExtendedSizeInBits() const {
+unsigned EVT::getExtendedSizeInBits() const {
   assert(isExtended() && "Type is not extended!");
   return LLVMTy->getSizeInBits();
 }