// Static 'Type' data
//===----------------------------------------------------------------------===//
-const Type *Type::VoidTy = new Type("void" , VoidTyID),
- *Type::BoolTy = new Type("bool" , BoolTyID),
- *Type::SByteTy = new SignedIntType("sbyte" , SByteTyID, 1),
- *Type::UByteTy = new UnsignedIntType("ubyte" , UByteTyID, 1),
- *Type::ShortTy = new SignedIntType("short" , ShortTyID, 2),
- *Type::UShortTy = new UnsignedIntType("ushort", UShortTyID, 2),
- *Type::IntTy = new SignedIntType("int" , IntTyID, 4),
- *Type::UIntTy = new UnsignedIntType("uint" , UIntTyID, 4),
- *Type::LongTy = new SignedIntType("long" , LongTyID, 8),
- *Type::ULongTy = new UnsignedIntType("ulong" , ULongTyID, 8),
- *Type::FloatTy = new Type("float" , FloatTyID),
- *Type::DoubleTy = new Type("double", DoubleTyID),
- *Type::TypeTy = &TheTypeType,
- *Type::LabelTy = new Type("label" , LabelTyID);
+Type *Type::VoidTy = new Type("void" , VoidTyID),
+ *Type::BoolTy = new Type("bool" , BoolTyID),
+ *Type::SByteTy = new SignedIntType("sbyte" , SByteTyID, 1),
+ *Type::UByteTy = new UnsignedIntType("ubyte" , UByteTyID, 1),
+ *Type::ShortTy = new SignedIntType("short" , ShortTyID, 2),
+ *Type::UShortTy = new UnsignedIntType("ushort", UShortTyID, 2),
+ *Type::IntTy = new SignedIntType("int" , IntTyID, 4),
+ *Type::UIntTy = new UnsignedIntType("uint" , UIntTyID, 4),
+ *Type::LongTy = new SignedIntType("long" , LongTyID, 8),
+ *Type::ULongTy = new UnsignedIntType("ulong" , ULongTyID, 8),
+ *Type::FloatTy = new Type("float" , FloatTyID),
+ *Type::DoubleTy = new Type("double", DoubleTyID),
+ *Type::TypeTy = &TheTypeType,
+ *Type::LabelTy = new Type("label" , LabelTyID);
//===----------------------------------------------------------------------===//
ResultType(PATypeHandle<Type>(Result, this)),
isVarArgs(IsVarArgs) {
ParamTys.reserve(Params.size());
- for (unsigned i = 0; i < Params.size()-IsVarArgs; ++i)
+ for (unsigned i = 0; i < Params.size(); ++i)
ParamTys.push_back(PATypeHandle<Type>(Params[i], this));
setDerivedTypeProperties();
StructType::StructType(const vector<const Type*> &Types)
: DerivedType("", StructTyID) {
ETypes.reserve(Types.size());
- for (unsigned i = 0; i < Types.size(); ++i)
+ for (unsigned i = 0; i < Types.size(); ++i) {
+ assert(Types[i] != Type::VoidTy && "Void type in method prototype!!");
ETypes.push_back(PATypeHandle<Type>(Types[i], this));
+ }
setDerivedTypeProperties();
}
if (!Ty->isAbstract() && !Ty->isRecursive() && // Base case for the recursion
Ty->getDescription().size()) {
Result = Ty->getDescription(); // Primitive = leaf type
- } else if (Ty->isOpaqueType()) { // Base case for the recursion
+ } else if (isa<OpaqueType>(Ty)) { // Base case for the recursion
Result = Ty->getDescription(); // Opaque = leaf type
isAbstract = true; // This whole type is abstract!
} else {
switch (Ty->getPrimitiveID()) {
case Type::MethodTyID: {
- const MethodType *MTy = (const MethodType*)Ty;
+ const MethodType *MTy = cast<const MethodType>(Ty);
Result = getTypeProps(MTy->getReturnType(), TypeStack,
isAbstract, isRecursive)+" (";
for (MethodType::ParamTypes::const_iterator
break;
}
case Type::StructTyID: {
- const StructType *STy = (const StructType*)Ty;
+ const StructType *STy = cast<const StructType>(Ty);
Result = "{ ";
for (StructType::ElementTypes::const_iterator
I = STy->getElementTypes().begin(),
break;
}
case Type::PointerTyID: {
- const PointerType *PTy = (const PointerType*)Ty;
+ const PointerType *PTy = cast<const PointerType>(Ty);
Result = getTypeProps(PTy->getValueType(), TypeStack,
isAbstract, isRecursive) + " *";
break;
}
case Type::ArrayTyID: {
- const ArrayType *ATy = (const ArrayType*)Ty;
+ const ArrayType *ATy = cast<const ArrayType>(Ty);
int NumElements = ATy->getNumElements();
Result = "[";
if (NumElements != -1) Result += itostr(NumElements) + " x ";
if (Ty == Ty2) return true;
if (Ty->getPrimitiveID() != Ty2->getPrimitiveID()) return false;
if (Ty->isPrimitiveType()) return true;
+ if (isa<OpaqueType>(Ty))
+ return false; // Two nonequal opaque types are never equal
if (Ty != Ty2) {
map<const Type*, const Type*>::iterator I = EqTypes.find(Ty);
for (; I != IE && I2 != IE2; ++I, ++I2)
if (!TypesEqual(*I, *I2, EqTypes)) return false;
- // One really annoying special case that breaks an otherwise nice simple
+ // Two really annoying special cases that breaks an otherwise nice simple
// algorithm is the fact that arraytypes have sizes that differentiates types,
- // consider this now.
- if (Ty->isArrayType())
- if (((const ArrayType*)Ty)->getNumElements() !=
- ((const ArrayType*)Ty2)->getNumElements()) return false;
+ // and that method types can be varargs or not. Consider this now.
+ if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
+ if (ATy->getNumElements() != cast<const ArrayType>(Ty2)->getNumElements())
+ return false;
+ } else if (const MethodType *MTy = dyn_cast<MethodType>(Ty)) {
+ if (MTy->isVarArg() != cast<const MethodType>(Ty2)->isVarArg())
+ return false;
+ }
+
return I == IE && I2 == IE2; // Types equal if both iterators are done
}
class MethodValType : public ValTypeBase<MethodValType, MethodType> {
PATypeHandle<Type> RetTy;
vector<PATypeHandle<Type> > ArgTypes;
+ bool isVarArg;
public:
MethodValType(const Type *ret, const vector<const Type*> &args,
- TypeMap<MethodValType, MethodType> &Tab)
- : ValTypeBase<MethodValType, MethodType>(Tab), RetTy(ret, this) {
+ bool IVA, TypeMap<MethodValType, MethodType> &Tab)
+ : ValTypeBase<MethodValType, MethodType>(Tab), RetTy(ret, this),
+ isVarArg(IVA) {
for (unsigned i = 0; i < args.size(); ++i)
ArgTypes.push_back(PATypeHandle<Type>(args[i], this));
}
// this MethodValType owns them, not the old one!
//
MethodValType(const MethodValType &MVT)
- : ValTypeBase<MethodValType, MethodType>(MVT), RetTy(MVT.RetTy, this) {
+ : ValTypeBase<MethodValType, MethodType>(MVT), RetTy(MVT.RetTy, this),
+ isVarArg(MVT.isVarArg) {
ArgTypes.reserve(MVT.ArgTypes.size());
for (unsigned i = 0; i < MVT.ArgTypes.size(); ++i)
ArgTypes.push_back(PATypeHandle<Type>(MVT.ArgTypes[i], this));
}
inline bool operator<(const MethodValType &MTV) const {
- return RetTy.get() < MTV.RetTy.get() ||
- (RetTy.get() == MTV.RetTy.get() && ArgTypes < MTV.ArgTypes);
+ if (RetTy.get() < MTV.RetTy.get()) return true;
+ if (RetTy.get() > MTV.RetTy.get()) return false;
+
+ if (ArgTypes < MTV.ArgTypes) return true;
+ return (ArgTypes == MTV.ArgTypes) && isVarArg < MTV.isVarArg;
}
};
// MethodType::get - The factory function for the MethodType class...
MethodType *MethodType::get(const Type *ReturnType,
- const vector<const Type*> &Params) {
- MethodValType VT(ReturnType, Params, MethodTypes);
+ const vector<const Type*> &Params,
+ bool isVarArg) {
+ MethodValType VT(ReturnType, Params, isVarArg, MethodTypes);
MethodType *MT = MethodTypes.get(VT);
if (MT) return MT;
- bool IsVarArg = Params.size() && (Params[Params.size()-1] == Type::VoidTy);
- MethodTypes.add(VT, MT = new MethodType(ReturnType, Params, IsVarArg));
+ MethodTypes.add(VT, MT = new MethodType(ReturnType, Params, isVarArg));
#ifdef DEBUG_MERGE_TYPES
cerr << "Derived new type: " << MT << endl;
<< (void*)this << " " << getDescription() << "] to ["
<< (void*)NewTy.get() << " " << NewTy->getDescription() << "]!\n";
#endif
- AbstractTypeUsers.back()->refineAbstractType(this, NewTy);
+ User->refineAbstractType(this, NewTy);
assert(AbstractTypeUsers.size() != OldSize &&
"AbsTyUser did not remove self from user list!");
projects / oota-llvm.git / blobdiff