Remove the Type::getNumElements() method, which is only called in 4 places,
did something extremely surprising, and shadowed actually useful
implementations that had completely different behavior.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148898 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Type.h b/include/llvm/Type.h
index 95edb50..e7c165b 100644
--- a/include/llvm/Type.h
+++ b/include/llvm/Type.h
@@ -294,10 +294,6 @@
/// otherwise return 'this'.
Type *getScalarType();
- /// getNumElements - If this is a vector type, return the number of elements,
- /// otherwise return zero.
- unsigned getNumElements();
-
//===--------------------------------------------------------------------===//
// Type Iteration support.
//
diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp
index 1976832..0fcce09 100644
--- a/lib/VMCore/Constants.cpp
+++ b/lib/VMCore/Constants.cpp
@@ -1505,8 +1505,10 @@
"PtrToInt source must be pointer or pointer vector");
assert(DstTy->getScalarType()->isIntegerTy() &&
"PtrToInt destination must be integer or integer vector");
- assert(C->getType()->getNumElements() == DstTy->getNumElements() &&
- "Invalid cast between a different number of vector elements");
+ assert(isa<VectorType>(C->getType()) == isa<VectorType>(DstTy));
+ if (VectorType *VT = dyn_cast<VectorType>(C->getType()))
+ assert(VT->getNumElements() == cast<VectorType>(DstTy)->getNumElements() &&
+ "Invalid cast between a different number of vector elements");
return getFoldedCast(Instruction::PtrToInt, C, DstTy);
}
@@ -1515,8 +1517,10 @@
"IntToPtr source must be integer or integer vector");
assert(DstTy->getScalarType()->isPointerTy() &&
"IntToPtr destination must be a pointer or pointer vector");
- assert(C->getType()->getNumElements() == DstTy->getNumElements() &&
- "Invalid cast between a different number of vector elements");
+ assert(isa<VectorType>(C->getType()) == isa<VectorType>(DstTy));
+ if (VectorType *VT = dyn_cast<VectorType>(C->getType()))
+ assert(VT->getNumElements() == cast<VectorType>(DstTy)->getNumElements() &&
+ "Invalid cast between a different number of vector elements");
return getFoldedCast(Instruction::IntToPtr, C, DstTy);
}
@@ -2018,7 +2022,9 @@
/// getNumElements - Return the number of elements in the array or vector.
unsigned ConstantDataSequential::getNumElements() const {
- return getType()->getNumElements();
+ if (ArrayType *AT = dyn_cast<ArrayType>(getType()))
+ return AT->getNumElements();
+ return cast<VectorType>(getType())->getNumElements();
}
diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index 8c375c2..2c69874 100644
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -2671,13 +2671,19 @@
return SrcTy->isFPOrFPVectorTy() && DstTy->isIntOrIntVectorTy() &&
SrcLength == DstLength;
case Instruction::PtrToInt:
- if (SrcTy->getNumElements() != DstTy->getNumElements())
+ if (isa<VectorType>(SrcTy) != isa<VectorType>(DstTy))
return false;
+ if (VectorType *VT = dyn_cast<VectorType>(SrcTy))
+ if (VT->getNumElements() != cast<VectorType>(DstTy)->getNumElements())
+ return false;
return SrcTy->getScalarType()->isPointerTy() &&
DstTy->getScalarType()->isIntegerTy();
case Instruction::IntToPtr:
- if (SrcTy->getNumElements() != DstTy->getNumElements())
+ if (isa<VectorType>(SrcTy) != isa<VectorType>(DstTy))
return false;
+ if (VectorType *VT = dyn_cast<VectorType>(SrcTy))
+ if (VT->getNumElements() != cast<VectorType>(DstTy)->getNumElements())
+ return false;
return SrcTy->getScalarType()->isIntegerTy() &&
DstTy->getScalarType()->isPointerTy();
case Instruction::BitCast:
diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp
index fe07e9e..7edd9e6 100644
--- a/lib/VMCore/Type.cpp
+++ b/lib/VMCore/Type.cpp
@@ -47,14 +47,6 @@
return this;
}
-/// getNumElements - If this is a vector type, return the number of elements,
-/// otherwise return zero.
-unsigned Type::getNumElements() {
- if (VectorType *VTy = dyn_cast<VectorType>(this))
- return VTy->getNumElements();
- return 0;
-}
-
/// isIntegerTy - Return true if this is an IntegerType of the specified width.
bool Type::isIntegerTy(unsigned Bitwidth) const {
return isIntegerTy() && cast<IntegerType>(this)->getBitWidth() == Bitwidth;