Merge commit '1e04923d21f8e2a3557690340ac7e7936dab20e5' into feature/merge-get-vector-num-elements

Author: kaz7

llvm/include/llvm/Support/MachineValueType.h

@@ -872,7 +872,11 @@ namespace llvm {
     }
 
     unsigned getVectorNumElements() const {
-      // TODO: Check that this isn't a scalable vector.
+      if (isScalableVector())
+        llvm::reportInvalidSizeRequest(
+            "Possible incorrect use of MVT::getVectorNumElements() for "
+            "scalable vector. Scalable flag may be dropped, use "
+            "MVT::getVectorElementCount() instead");
       return getVectorMinNumElements();
     }
 

llvm/lib/Support/LowLevelType.cpp

@@ -17,7 +17,7 @@ using namespace llvm;
 
 LLT::LLT(MVT VT) {
   if (VT.isVector()) {
-    bool asVector = VT.getVectorNumElements() > 1;
+    bool asVector = VT.getVectorMinNumElements() > 1;
     init(/*IsPointer=*/false, asVector, /*IsScalar=*/!asVector,
          VT.getVectorElementCount(), VT.getVectorElementType().getSizeInBits(),
          /*AddressSpace=*/0);