6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-22 09:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Remove the Type::getNumElements() method, which is only called in 4 places,

Browse Source 
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
This commit is contained in:
Chris Lattner 2012-01-25 01:32:59 +00:00
parent 0f193b8a68
commit af7b4fb9be
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Type.h
View File

@ -294,10 +294,6 @@ public:
/// 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.
//

16
lib/VMCore/Constants.cpp
View File

@ -1505,8 +1505,10 @@ Constant *ConstantExpr::getPtrToInt(Constant *C, Type *DstTy) {
"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 @@ Constant *ConstantExpr::getIntToPtr(Constant *C, Type *DstTy) {
"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 @@ bool ConstantDataSequential::isElementTypeCompatible(const Type *Ty) {
/// 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();
}

10
lib/VMCore/Instructions.cpp
View File

@ -2671,13 +2671,19 @@ CastInst::castIsValid(Instruction::CastOps op, Value *S, Type *DstTy) {
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:

8
lib/VMCore/Type.cpp
View File

@ -47,14 +47,6 @@ Type *Type::getScalarType() {
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;