//
//===----------------------------------------------------------------------===//
-#include "llvm/AbstractTypeUser.h"
#include "llvm/DerivedTypes.h"
-#include "llvm/SymbolTable.h"
+#include "llvm/ParameterAttributes.h"
#include "llvm/Constants.h"
#include "llvm/ADT/DepthFirstIterator.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/Debug.h"
#include <algorithm>
using namespace llvm;
// created and later destroyed, all in an effort to make sure that there is only
// a single canonical version of a type.
//
-//#define DEBUG_MERGE_TYPES 1
+// #define DEBUG_MERGE_TYPES 1
AbstractTypeUser::~AbstractTypeUser() {}
static ManagedStatic<std::map<const Type*,
std::string> > AbstractTypeDescriptions;
-Type::Type(const char *Name, TypeID id)
- : ID(id), Abstract(false), RefCount(0), ForwardType(0) {
- assert(Name && Name[0] && "Should use other ctor if no name!");
- (*ConcreteTypeDescriptions)[this] = Name;
-}
+/// Because of the way Type subclasses are allocated, this function is necessary
+/// to use the correct kind of "delete" operator to deallocate the Type object.
+/// Some type objects (FunctionTy, StructTy) allocate additional space after
+/// the space for their derived type to hold the contained types array of
+/// PATypeHandles. Using this allocation scheme means all the PATypeHandles are
+/// allocated with the type object, decreasing allocations and eliminating the
+/// need for a std::vector to be used in the Type class itself.
+/// @brief Type destruction function
+void Type::destroy() const {
+
+ // Structures and Functions allocate their contained types past the end of
+ // the type object itself. These need to be destroyed differently than the
+ // other types.
+ if (isa<FunctionType>(this) || isa<StructType>(this)) {
+ // First, make sure we destruct any PATypeHandles allocated by these
+ // subclasses. They must be manually destructed.
+ for (unsigned i = 0; i < NumContainedTys; ++i)
+ ContainedTys[i].PATypeHandle::~PATypeHandle();
+
+ // Now call the destructor for the subclass directly because we're going
+ // to delete this as an array of char.
+ if (isa<FunctionType>(this))
+ ((FunctionType*)this)->FunctionType::~FunctionType();
+ else
+ ((StructType*)this)->StructType::~StructType();
+
+ // Finally, remove the memory as an array deallocation of the chars it was
+ // constructed from.
+ delete [] reinterpret_cast<const char*>(this);
+
+ return;
+ }
+ // For all the other type subclasses, there is either no contained types or
+ // just one (all Sequentials). For Sequentials, the PATypeHandle is not
+ // allocated past the type object, its included directly in the SequentialType
+ // class. This means we can safely just do "normal" delete of this object and
+ // all the destructors that need to run will be run.
+ delete this;
+}
const Type *Type::getPrimitiveType(TypeID IDNumber) {
switch (IDNumber) {
case VoidTyID : return VoidTy;
- case BoolTyID : return BoolTy;
- case UByteTyID : return UByteTy;
- case SByteTyID : return SByteTy;
- case UShortTyID: return UShortTy;
- case ShortTyID : return ShortTy;
- case UIntTyID : return UIntTy;
- case IntTyID : return IntTy;
- case ULongTyID : return ULongTy;
- case LongTyID : return LongTy;
case FloatTyID : return FloatTy;
case DoubleTyID: return DoubleTy;
case LabelTyID : return LabelTy;
}
}
+const Type *Type::getVAArgsPromotedType() const {
+ if (ID == IntegerTyID && getSubclassData() < 32)
+ return Type::Int32Ty;
+ else if (ID == FloatTyID)
+ return Type::DoubleTy;
+ else
+ return this;
+}
+
/// isFPOrFPVector - Return true if this is a FP type or a vector of FP types.
///
bool Type::isFPOrFPVector() const {
if (ID == Type::FloatTyID || ID == Type::DoubleTyID) return true;
- if (ID != Type::PackedTyID) return false;
+ if (ID != Type::VectorTyID) return false;
- return cast<PackedType>(this)->getElementType()->isFloatingPoint();
+ return cast<VectorType>(this)->getElementType()->isFloatingPoint();
}
-
-// isLosslesslyConvertibleTo - Return true if this type can be converted to
+// canLosslesllyBitCastTo - Return true if this type can be converted to
// 'Ty' without any reinterpretation of bits. For example, uint to int.
//
-bool Type::isLosslesslyConvertibleTo(const Type *Ty) const {
- if (this == Ty) return true;
-
- // Packed type conversions are always bitwise.
- if (isa<PackedType>(this) && isa<PackedType>(Ty))
+bool Type::canLosslesslyBitCastTo(const Type *Ty) const {
+ // Identity cast means no change so return true
+ if (this == Ty)
return true;
- if ((!isPrimitiveType() && !isa<PointerType>(this)) ||
- (!isa<PointerType>(Ty) && !Ty->isPrimitiveType())) return false;
-
- if (getTypeID() == Ty->getTypeID())
- return true; // Handles identity cast, and cast of differing pointer types
-
- // Now we know that they are two differing primitive or pointer types
- switch (getTypeID()) {
- case Type::UByteTyID: return Ty == Type::SByteTy;
- case Type::SByteTyID: return Ty == Type::UByteTy;
- case Type::UShortTyID: return Ty == Type::ShortTy;
- case Type::ShortTyID: return Ty == Type::UShortTy;
- case Type::UIntTyID: return Ty == Type::IntTy;
- case Type::IntTyID: return Ty == Type::UIntTy;
- case Type::ULongTyID: return Ty == Type::LongTy;
- case Type::LongTyID: return Ty == Type::ULongTy;
- case Type::PointerTyID: return isa<PointerType>(Ty);
- default:
- return false; // Other types have no identity values
- }
-}
-
-/// getUnsignedVersion - If this is an integer type, return the unsigned
-/// variant of this type. For example int -> uint.
-const Type *Type::getUnsignedVersion() const {
- switch (getTypeID()) {
- default:
- assert(isInteger()&&"Type::getUnsignedVersion is only valid for integers!");
- case Type::UByteTyID:
- case Type::SByteTyID: return Type::UByteTy;
- case Type::UShortTyID:
- case Type::ShortTyID: return Type::UShortTy;
- case Type::UIntTyID:
- case Type::IntTyID: return Type::UIntTy;
- case Type::ULongTyID:
- case Type::LongTyID: return Type::ULongTy;
- }
-}
+ // They are not convertible unless they are at least first class types
+ if (!this->isFirstClassType() || !Ty->isFirstClassType())
+ return false;
-/// getSignedVersion - If this is an integer type, return the signed variant
-/// of this type. For example uint -> int.
-const Type *Type::getSignedVersion() const {
- switch (getTypeID()) {
- default:
- assert(isInteger() && "Type::getSignedVersion is only valid for integers!");
- case Type::UByteTyID:
- case Type::SByteTyID: return Type::SByteTy;
- case Type::UShortTyID:
- case Type::ShortTyID: return Type::ShortTy;
- case Type::UIntTyID:
- case Type::IntTyID: return Type::IntTy;
- case Type::ULongTyID:
- case Type::LongTyID: return Type::LongTy;
- }
-}
-
-
-// getPrimitiveSize - Return the basic size of this type if it is a primitive
-// type. These are fixed by LLVM and are not target dependent. This will
-// return zero if the type does not have a size or is not a primitive type.
-//
-unsigned Type::getPrimitiveSize() const {
- switch (getTypeID()) {
- case Type::BoolTyID:
- case Type::SByteTyID:
- case Type::UByteTyID: return 1;
- case Type::UShortTyID:
- case Type::ShortTyID: return 2;
- case Type::FloatTyID:
- case Type::IntTyID:
- case Type::UIntTyID: return 4;
- case Type::LongTyID:
- case Type::ULongTyID:
- case Type::DoubleTyID: return 8;
- default: return 0;
- }
+ // Vector -> Vector conversions are always lossless if the two vector types
+ // have the same size, otherwise not.
+ if (const VectorType *thisPTy = dyn_cast<VectorType>(this))
+ if (const VectorType *thatPTy = dyn_cast<VectorType>(Ty))
+ return thisPTy->getBitWidth() == thatPTy->getBitWidth();
+
+ // At this point we have only various mismatches of the first class types
+ // remaining and ptr->ptr. Just select the lossless conversions. Everything
+ // else is not lossless.
+ if (isa<PointerType>(this))
+ return isa<PointerType>(Ty);
+ return false; // Other types have no identity values
}
unsigned Type::getPrimitiveSizeInBits() const {
switch (getTypeID()) {
- case Type::BoolTyID: return 1;
- case Type::SByteTyID:
- case Type::UByteTyID: return 8;
- case Type::UShortTyID:
- case Type::ShortTyID: return 16;
- case Type::FloatTyID:
- case Type::IntTyID:
- case Type::UIntTyID: return 32;
- case Type::LongTyID:
- case Type::ULongTyID:
+ case Type::FloatTyID: return 32;
case Type::DoubleTyID: return 64;
+ case Type::IntegerTyID: return cast<IntegerType>(this)->getBitWidth();
+ case Type::VectorTyID: return cast<VectorType>(this)->getBitWidth();
default: return 0;
}
}
/// iff all of the members of the type are sized as well. Since asking for
/// their size is relatively uncommon, move this operation out of line.
bool Type::isSizedDerivedType() const {
+ if (isa<IntegerType>(this))
+ return true;
+
if (const ArrayType *ATy = dyn_cast<ArrayType>(this))
return ATy->getElementType()->isSized();
- if (const PackedType *PTy = dyn_cast<PackedType>(this))
+ if (const VectorType *PTy = dyn_cast<VectorType>(this))
return PTy->getElementType()->isSized();
- if (!isa<StructType>(this)) return false;
+ if (!isa<StructType>(this))
+ return false;
// Okay, our struct is sized if all of the elements are...
for (subtype_iterator I = subtype_begin(), E = subtype_end(); I != E; ++I)
- if (!(*I)->isSized()) return false;
+ if (!(*I)->isSized())
+ return false;
return true;
}
if (!Ty->isAbstract()) { // Base case for the recursion
std::map<const Type*, std::string>::iterator I =
ConcreteTypeDescriptions->find(Ty);
- if (I != ConcreteTypeDescriptions->end()) return I->second;
+ if (I != ConcreteTypeDescriptions->end())
+ return I->second;
+
+ if (Ty->isPrimitiveType()) {
+ switch (Ty->getTypeID()) {
+ default: assert(0 && "Unknown prim type!");
+ case Type::VoidTyID: return (*ConcreteTypeDescriptions)[Ty] = "void";
+ case Type::FloatTyID: return (*ConcreteTypeDescriptions)[Ty] = "float";
+ case Type::DoubleTyID: return (*ConcreteTypeDescriptions)[Ty] = "double";
+ case Type::LabelTyID: return (*ConcreteTypeDescriptions)[Ty] = "label";
+ }
+ }
}
// Check to see if the Type is already on the stack...
TypeStack.push_back(Ty); // Add us to the stack..
switch (Ty->getTypeID()) {
+ case Type::IntegerTyID: {
+ const IntegerType *ITy = cast<IntegerType>(Ty);
+ Result = "i" + utostr(ITy->getBitWidth());
+ break;
+ }
case Type::FunctionTyID: {
const FunctionType *FTy = cast<FunctionType>(Ty);
- Result = getTypeDescription(FTy->getReturnType(), TypeStack) + " (";
+ if (!Result.empty())
+ Result += " ";
+ Result += getTypeDescription(FTy->getReturnType(), TypeStack) + " (";
+ unsigned Idx = 1;
+ const ParamAttrsList *Attrs = FTy->getParamAttrs();
for (FunctionType::param_iterator I = FTy->param_begin(),
E = FTy->param_end(); I != E; ++I) {
if (I != FTy->param_begin())
Result += ", ";
+ if (Attrs && Attrs->getParamAttrs(Idx) != ParamAttr::None)
+ Result += Attrs->getParamAttrsTextByIndex(Idx);
+ Idx++;
Result += getTypeDescription(*I, TypeStack);
}
if (FTy->isVarArg()) {
Result += "...";
}
Result += ")";
+ if (Attrs && Attrs->getParamAttrs(0) != ParamAttr::None) {
+ Result += " " + Attrs->getParamAttrsTextByIndex(0);
+ }
break;
}
case Type::StructTyID: {
const StructType *STy = cast<StructType>(Ty);
- Result = "{ ";
+ if (STy->isPacked())
+ Result = "<{ ";
+ else
+ Result = "{ ";
for (StructType::element_iterator I = STy->element_begin(),
E = STy->element_end(); I != E; ++I) {
if (I != STy->element_begin())
Result += getTypeDescription(*I, TypeStack);
}
Result += " }";
+ if (STy->isPacked())
+ Result += ">";
break;
}
case Type::PointerTyID: {
Result += getTypeDescription(ATy->getElementType(), TypeStack) + "]";
break;
}
- case Type::PackedTyID: {
- const PackedType *PTy = cast<PackedType>(Ty);
+ case Type::VectorTyID: {
+ const VectorType *PTy = cast<VectorType>(Ty);
unsigned NumElements = PTy->getNumElements();
Result = "<";
Result += utostr(NumElements) + " x ";
bool StructType::indexValid(const Value *V) const {
- // Structure indexes require unsigned integer constants.
- if (V->getType() == Type::UIntTy)
+ // Structure indexes require 32-bit integer constants.
+ if (V->getType() == Type::Int32Ty)
if (const ConstantInt *CU = dyn_cast<ConstantInt>(V))
- return CU->getZExtValue() < ContainedTys.size();
+ return CU->getZExtValue() < NumContainedTys;
return false;
}
return ContainedTys[Idx];
}
-
//===----------------------------------------------------------------------===//
// Primitive 'Type' data
//===----------------------------------------------------------------------===//
-#define DeclarePrimType(TY, Str) \
- namespace { \
- struct VISIBILITY_HIDDEN TY##Type : public Type { \
- TY##Type() : Type(Str, Type::TY##TyID) {} \
- }; \
- } \
- static ManagedStatic<TY##Type> The##TY##Ty; \
- Type *Type::TY##Ty = &*The##TY##Ty
-
-DeclarePrimType(Void, "void");
-DeclarePrimType(Bool, "bool");
-DeclarePrimType(SByte, "sbyte");
-DeclarePrimType(UByte, "ubyte");
-DeclarePrimType(Short, "short");
-DeclarePrimType(UShort, "ushort");
-DeclarePrimType(Int, "int");
-DeclarePrimType(UInt, "uint");
-DeclarePrimType(Long, "long");
-DeclarePrimType(ULong, "ulong");
-DeclarePrimType(Float, "float");
-DeclarePrimType(Double, "double");
-DeclarePrimType(Label, "label");
-#undef DeclarePrimType
+const Type *Type::VoidTy = new Type(Type::VoidTyID);
+const Type *Type::FloatTy = new Type(Type::FloatTyID);
+const Type *Type::DoubleTy = new Type(Type::DoubleTyID);
+const Type *Type::LabelTy = new Type(Type::LabelTyID);
+
+namespace {
+ struct BuiltinIntegerType : public IntegerType {
+ BuiltinIntegerType(unsigned W) : IntegerType(W) {}
+ };
+}
+const IntegerType *Type::Int1Ty = new BuiltinIntegerType(1);
+const IntegerType *Type::Int8Ty = new BuiltinIntegerType(8);
+const IntegerType *Type::Int16Ty = new BuiltinIntegerType(16);
+const IntegerType *Type::Int32Ty = new BuiltinIntegerType(32);
+const IntegerType *Type::Int64Ty = new BuiltinIntegerType(64);
//===----------------------------------------------------------------------===//
FunctionType::FunctionType(const Type *Result,
const std::vector<const Type*> &Params,
- bool IsVarArgs) : DerivedType(FunctionTyID),
- isVarArgs(IsVarArgs) {
+ bool IsVarArgs, const ParamAttrsList *Attrs)
+ : DerivedType(FunctionTyID), isVarArgs(IsVarArgs), ParamAttrs(Attrs) {
+ ContainedTys = reinterpret_cast<PATypeHandle*>(this+1);
+ NumContainedTys = Params.size() + 1; // + 1 for result type
assert((Result->isFirstClassType() || Result == Type::VoidTy ||
isa<OpaqueType>(Result)) &&
"LLVM functions cannot return aggregates");
bool isAbstract = Result->isAbstract();
- ContainedTys.reserve(Params.size()+1);
- ContainedTys.push_back(PATypeHandle(Result, this));
+ new (&ContainedTys[0]) PATypeHandle(Result, this);
for (unsigned i = 0; i != Params.size(); ++i) {
assert((Params[i]->isFirstClassType() || isa<OpaqueType>(Params[i])) &&
"Function arguments must be value types!");
-
- ContainedTys.push_back(PATypeHandle(Params[i], this));
+ new (&ContainedTys[i+1]) PATypeHandle(Params[i],this);
isAbstract |= Params[i]->isAbstract();
}
setAbstract(isAbstract);
}
-StructType::StructType(const std::vector<const Type*> &Types)
+StructType::StructType(const std::vector<const Type*> &Types, bool isPacked)
: CompositeType(StructTyID) {
- ContainedTys.reserve(Types.size());
+ ContainedTys = reinterpret_cast<PATypeHandle*>(this + 1);
+ NumContainedTys = Types.size();
+ setSubclassData(isPacked);
bool isAbstract = false;
for (unsigned i = 0; i < Types.size(); ++i) {
assert(Types[i] != Type::VoidTy && "Void type for structure field!!");
- ContainedTys.push_back(PATypeHandle(Types[i], this));
+ new (&ContainedTys[i]) PATypeHandle(Types[i], this);
isAbstract |= Types[i]->isAbstract();
}
setAbstract(ElType->isAbstract());
}
-PackedType::PackedType(const Type *ElType, unsigned NumEl)
- : SequentialType(PackedTyID, ElType) {
+VectorType::VectorType(const Type *ElType, unsigned NumEl)
+ : SequentialType(VectorTyID, ElType) {
NumElements = NumEl;
+ setAbstract(ElType->isAbstract());
+ assert(NumEl > 0 && "NumEl of a VectorType must be greater than 0");
+ assert((ElType->isInteger() || ElType->isFloatingPoint() ||
+ isa<OpaqueType>(ElType)) &&
+ "Elements of a VectorType must be a primitive type");
- assert(NumEl > 0 && "NumEl of a PackedType must be greater than 0");
- assert((ElType->isIntegral() || ElType->isFloatingPoint()) &&
- "Elements of a PackedType must be a primitive type");
}
// another (more concrete) type, we must eliminate all references to other
// types, to avoid some circular reference problems.
void DerivedType::dropAllTypeUses() {
- if (!ContainedTys.empty()) {
+ if (NumContainedTys != 0) {
// The type must stay abstract. To do this, we insert a pointer to a type
// that will never get resolved, thus will always be abstract.
static Type *AlwaysOpaqueTy = OpaqueType::get();
static PATypeHolder Holder(AlwaysOpaqueTy);
ContainedTys[0] = AlwaysOpaqueTy;
- // Change the rest of the types to be intty's. It doesn't matter what we
+ // Change the rest of the types to be Int32Ty's. It doesn't matter what we
// pick so long as it doesn't point back to this type. We choose something
// concrete to avoid overhead for adding to AbstracTypeUser lists and stuff.
- for (unsigned i = 1, e = ContainedTys.size(); i != e; ++i)
- ContainedTys[i] = Type::IntTy;
+ for (unsigned i = 1, e = NumContainedTys; i != e; ++i)
+ ContainedTys[i] = Type::Int32Ty;
}
}
// algorithm is the fact that arraytypes have sizes that differentiates types,
// and that function types can be varargs or not. Consider this now.
//
- if (const PointerType *PTy = dyn_cast<PointerType>(Ty)) {
+ if (const IntegerType *ITy = dyn_cast<IntegerType>(Ty)) {
+ const IntegerType *ITy2 = cast<IntegerType>(Ty2);
+ return ITy->getBitWidth() == ITy2->getBitWidth();
+ } else if (const PointerType *PTy = dyn_cast<PointerType>(Ty)) {
return TypesEqual(PTy->getElementType(),
cast<PointerType>(Ty2)->getElementType(), EqTypes);
} else if (const StructType *STy = dyn_cast<StructType>(Ty)) {
const StructType *STy2 = cast<StructType>(Ty2);
if (STy->getNumElements() != STy2->getNumElements()) return false;
+ if (STy->isPacked() != STy2->isPacked()) return false;
for (unsigned i = 0, e = STy2->getNumElements(); i != e; ++i)
if (!TypesEqual(STy->getElementType(i), STy2->getElementType(i), EqTypes))
return false;
const ArrayType *ATy2 = cast<ArrayType>(Ty2);
return ATy->getNumElements() == ATy2->getNumElements() &&
TypesEqual(ATy->getElementType(), ATy2->getElementType(), EqTypes);
- } else if (const PackedType *PTy = dyn_cast<PackedType>(Ty)) {
- const PackedType *PTy2 = cast<PackedType>(Ty2);
+ } else if (const VectorType *PTy = dyn_cast<VectorType>(Ty)) {
+ const VectorType *PTy2 = cast<VectorType>(Ty2);
return PTy->getNumElements() == PTy2->getNumElements() &&
TypesEqual(PTy->getElementType(), PTy2->getElementType(), EqTypes);
} else if (const FunctionType *FTy = dyn_cast<FunctionType>(Ty)) {
FTy->getNumParams() != FTy2->getNumParams() ||
!TypesEqual(FTy->getReturnType(), FTy2->getReturnType(), EqTypes))
return false;
- for (unsigned i = 0, e = FTy2->getNumParams(); i != e; ++i)
+ const ParamAttrsList *Attrs1 = FTy->getParamAttrs();
+ const ParamAttrsList *Attrs2 = FTy2->getParamAttrs();
+ if ((!Attrs1 && Attrs2) || (!Attrs2 && Attrs1) ||
+ (Attrs1 && Attrs2 && (Attrs1->size() != Attrs2->size() ||
+ (Attrs1->getParamAttrs(0) != Attrs2->getParamAttrs(0)))))
+ return false;
+
+ for (unsigned i = 0, e = FTy2->getNumParams(); i != e; ++i) {
+ if (Attrs1 && Attrs1->getParamAttrs(i+1) != Attrs2->getParamAttrs(i+1))
+ return false;
if (!TypesEqual(FTy->getParamType(i), FTy2->getParamType(i), EqTypes))
return false;
+ }
return true;
} else {
assert(0 && "Unknown derived type!");
switch (SubTy->getTypeID()) {
default: break;
case Type::OpaqueTyID: return 0; // Opaque -> hash = 0 no matter what.
+ case Type::IntegerTyID:
+ HashVal ^= (cast<IntegerType>(SubTy)->getBitWidth() << 3);
+ break;
case Type::FunctionTyID:
HashVal ^= cast<FunctionType>(SubTy)->getNumParams()*2 +
cast<FunctionType>(SubTy)->isVarArg();
case Type::ArrayTyID:
HashVal ^= cast<ArrayType>(SubTy)->getNumElements();
break;
- case Type::PackedTyID:
- HashVal ^= cast<PackedType>(SubTy)->getNumElements();
+ case Type::VectorTyID:
+ HashVal ^= cast<VectorType>(SubTy)->getNumElements();
break;
case Type::StructTyID:
HashVal ^= cast<StructType>(SubTy)->getNumElements();
print("add");
}
- void clear(std::vector<Type *> &DerivedTypes) {
- for (typename std::map<ValType, PATypeHolder>::iterator I = Map.begin(),
- E = Map.end(); I != E; ++I)
- DerivedTypes.push_back(I->second.get());
- TypesByHash.clear();
- Map.clear();
- }
-
- /// RefineAbstractType - This method is called after we have merged a type
+ /// RefineAbstractType - This method is called after we have merged a type
/// with another one. We must now either merge the type away with
/// some other type or reinstall it in the map with it's new configuration.
void RefineAbstractType(TypeClass *Ty, const DerivedType *OldType,
unsigned OldTypeHash = ValType::hashTypeStructure(Ty);
// Find the type element we are refining... and change it now!
- for (unsigned i = 0, e = Ty->ContainedTys.size(); i != e; ++i)
+ for (unsigned i = 0, e = Ty->getNumContainedTypes(); i != e; ++i)
if (Ty->ContainedTys[i] == OldType)
Ty->ContainedTys[i] = NewType;
unsigned NewTypeHash = ValType::hashTypeStructure(Ty);
// Function Type Factory and Value Class...
//
+//===----------------------------------------------------------------------===//
+// Integer Type Factory...
+//
+namespace llvm {
+class IntegerValType {
+ uint32_t bits;
+public:
+ IntegerValType(uint16_t numbits) : bits(numbits) {}
+
+ static IntegerValType get(const IntegerType *Ty) {
+ return IntegerValType(Ty->getBitWidth());
+ }
+
+ static unsigned hashTypeStructure(const IntegerType *Ty) {
+ return (unsigned)Ty->getBitWidth();
+ }
+
+ inline bool operator<(const IntegerValType &IVT) const {
+ return bits < IVT.bits;
+ }
+};
+}
+
+static ManagedStatic<TypeMap<IntegerValType, IntegerType> > IntegerTypes;
+
+const IntegerType *IntegerType::get(unsigned NumBits) {
+ assert(NumBits >= MIN_INT_BITS && "bitwidth too small");
+ assert(NumBits <= MAX_INT_BITS && "bitwidth too large");
+
+ // Check for the built-in integer types
+ switch (NumBits) {
+ case 1: return cast<IntegerType>(Type::Int1Ty);
+ case 8: return cast<IntegerType>(Type::Int8Ty);
+ case 16: return cast<IntegerType>(Type::Int16Ty);
+ case 32: return cast<IntegerType>(Type::Int32Ty);
+ case 64: return cast<IntegerType>(Type::Int64Ty);
+ default:
+ break;
+ }
+
+ IntegerValType IVT(NumBits);
+ IntegerType *ITy = IntegerTypes->get(IVT);
+ if (ITy) return ITy; // Found a match, return it!
+
+ // Value not found. Derive a new type!
+ ITy = new IntegerType(NumBits);
+ IntegerTypes->add(IVT, ITy);
+
+#ifdef DEBUG_MERGE_TYPES
+ DOUT << "Derived new type: " << *ITy << "\n";
+#endif
+ return ITy;
+}
+
+bool IntegerType::isPowerOf2ByteWidth() const {
+ unsigned BitWidth = getBitWidth();
+ return (BitWidth > 7) && isPowerOf2_32(BitWidth);
+}
+
+APInt IntegerType::getMask() const {
+ return APInt::getAllOnesValue(getBitWidth());
+}
+
// FunctionValType - Define a class to hold the key that goes into the TypeMap
//
namespace llvm {
class FunctionValType {
const Type *RetTy;
std::vector<const Type*> ArgTypes;
+ const ParamAttrsList *ParamAttrs;
bool isVarArg;
public:
FunctionValType(const Type *ret, const std::vector<const Type*> &args,
- bool IVA) : RetTy(ret), isVarArg(IVA) {
+ bool IVA, const ParamAttrsList *attrs)
+ : RetTy(ret), ParamAttrs(attrs), isVarArg(IVA) {
for (unsigned i = 0; i < args.size(); ++i)
ArgTypes.push_back(args[i]);
}
static FunctionValType get(const FunctionType *FT);
static unsigned hashTypeStructure(const FunctionType *FT) {
- return FT->getNumParams()*2+FT->isVarArg();
- }
-
- // Subclass should override this... to update self as usual
- void doRefinement(const DerivedType *OldType, const Type *NewType) {
- if (RetTy == OldType) RetTy = NewType;
- for (unsigned i = 0, e = ArgTypes.size(); i != e; ++i)
- if (ArgTypes[i] == OldType) ArgTypes[i] = NewType;
+ unsigned Result = FT->getNumParams()*64 + FT->isVarArg();
+ if (FT->getParamAttrs())
+ Result += FT->getParamAttrs()->size()*2;
+ return Result;
}
inline bool operator<(const FunctionValType &MTV) const {
if (RetTy < MTV.RetTy) return true;
if (RetTy > MTV.RetTy) return false;
-
+ if (isVarArg < MTV.isVarArg) return true;
+ if (isVarArg > MTV.isVarArg) return false;
if (ArgTypes < MTV.ArgTypes) return true;
- return ArgTypes == MTV.ArgTypes && isVarArg < MTV.isVarArg;
+ if (ArgTypes > MTV.ArgTypes) return false;
+ if (ParamAttrs)
+ if (MTV.ParamAttrs)
+ return *ParamAttrs < *MTV.ParamAttrs;
+ else
+ return false;
+ else if (MTV.ParamAttrs)
+ return true;
+ return false;
}
};
}
ParamTypes.reserve(FT->getNumParams());
for (unsigned i = 0, e = FT->getNumParams(); i != e; ++i)
ParamTypes.push_back(FT->getParamType(i));
- return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg());
+ return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg(),
+ FT->getParamAttrs());
}
// FunctionType::get - The factory function for the FunctionType class...
FunctionType *FunctionType::get(const Type *ReturnType,
const std::vector<const Type*> &Params,
- bool isVarArg) {
- FunctionValType VT(ReturnType, Params, isVarArg);
- FunctionType *MT = FunctionTypes->get(VT);
- if (MT) return MT;
+ bool isVarArg,
+ const ParamAttrsList *Attrs) {
- FunctionTypes->add(VT, MT = new FunctionType(ReturnType, Params, isVarArg));
+ FunctionValType VT(ReturnType, Params, isVarArg, Attrs);
+ FunctionType *FT = FunctionTypes->get(VT);
+ if (FT) {
+ return FT;
+ }
+
+ FT = (FunctionType*) new char[sizeof(FunctionType) +
+ sizeof(PATypeHandle)*(Params.size()+1)];
+ new (FT) FunctionType(ReturnType, Params, isVarArg, Attrs);
+ FunctionTypes->add(VT, FT);
#ifdef DEBUG_MERGE_TYPES
- DOUT << "Derived new type: " << MT << "\n";
+ DOUT << "Derived new type: " << FT << "\n";
#endif
- return MT;
+ return FT;
+}
+
+bool FunctionType::isStructReturn() const {
+ if (ParamAttrs)
+ return ParamAttrs->paramHasAttr(1, ParamAttr::StructRet);
+ return false;
}
//===----------------------------------------------------------------------===//
return (unsigned)AT->getNumElements();
}
- // Subclass should override this... to update self as usual
- void doRefinement(const DerivedType *OldType, const Type *NewType) {
- assert(ValTy == OldType);
- ValTy = NewType;
- }
-
inline bool operator<(const ArrayValType &MTV) const {
if (Size < MTV.Size) return true;
return Size == MTV.Size && ValTy < MTV.ValTy;
//===----------------------------------------------------------------------===//
-// Packed Type Factory...
+// Vector Type Factory...
//
namespace llvm {
-class PackedValType {
+class VectorValType {
const Type *ValTy;
unsigned Size;
public:
- PackedValType(const Type *val, int sz) : ValTy(val), Size(sz) {}
+ VectorValType(const Type *val, int sz) : ValTy(val), Size(sz) {}
- static PackedValType get(const PackedType *PT) {
- return PackedValType(PT->getElementType(), PT->getNumElements());
+ static VectorValType get(const VectorType *PT) {
+ return VectorValType(PT->getElementType(), PT->getNumElements());
}
- static unsigned hashTypeStructure(const PackedType *PT) {
+ static unsigned hashTypeStructure(const VectorType *PT) {
return PT->getNumElements();
}
- // Subclass should override this... to update self as usual
- void doRefinement(const DerivedType *OldType, const Type *NewType) {
- assert(ValTy == OldType);
- ValTy = NewType;
- }
-
- inline bool operator<(const PackedValType &MTV) const {
+ inline bool operator<(const VectorValType &MTV) const {
if (Size < MTV.Size) return true;
return Size == MTV.Size && ValTy < MTV.ValTy;
}
};
}
-static ManagedStatic<TypeMap<PackedValType, PackedType> > PackedTypes;
+static ManagedStatic<TypeMap<VectorValType, VectorType> > VectorTypes;
-PackedType *PackedType::get(const Type *ElementType, unsigned NumElements) {
- assert(ElementType && "Can't get packed of null types!");
+VectorType *VectorType::get(const Type *ElementType, unsigned NumElements) {
+ assert(ElementType && "Can't get vector of null types!");
assert(isPowerOf2_32(NumElements) && "Vector length should be a power of 2!");
- PackedValType PVT(ElementType, NumElements);
- PackedType *PT = PackedTypes->get(PVT);
+ VectorValType PVT(ElementType, NumElements);
+ VectorType *PT = VectorTypes->get(PVT);
if (PT) return PT; // Found a match, return it!
// Value not found. Derive a new type!
- PackedTypes->add(PVT, PT = new PackedType(ElementType, NumElements));
+ VectorTypes->add(PVT, PT = new VectorType(ElementType, NumElements));
#ifdef DEBUG_MERGE_TYPES
DOUT << "Derived new type: " << *PT << "\n";
//
class StructValType {
std::vector<const Type*> ElTypes;
+ bool packed;
public:
- StructValType(const std::vector<const Type*> &args) : ElTypes(args) {}
+ StructValType(const std::vector<const Type*> &args, bool isPacked)
+ : ElTypes(args), packed(isPacked) {}
static StructValType get(const StructType *ST) {
std::vector<const Type *> ElTypes;
for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i)
ElTypes.push_back(ST->getElementType(i));
- return StructValType(ElTypes);
+ return StructValType(ElTypes, ST->isPacked());
}
static unsigned hashTypeStructure(const StructType *ST) {
return ST->getNumElements();
}
- // Subclass should override this... to update self as usual
- void doRefinement(const DerivedType *OldType, const Type *NewType) {
- for (unsigned i = 0; i < ElTypes.size(); ++i)
- if (ElTypes[i] == OldType) ElTypes[i] = NewType;
- }
-
inline bool operator<(const StructValType &STV) const {
- return ElTypes < STV.ElTypes;
+ if (ElTypes < STV.ElTypes) return true;
+ else if (ElTypes > STV.ElTypes) return false;
+ else return (int)packed < (int)STV.packed;
}
};
}
static ManagedStatic<TypeMap<StructValType, StructType> > StructTypes;
-StructType *StructType::get(const std::vector<const Type*> &ETypes) {
- StructValType STV(ETypes);
+StructType *StructType::get(const std::vector<const Type*> &ETypes,
+ bool isPacked) {
+ StructValType STV(ETypes, isPacked);
StructType *ST = StructTypes->get(STV);
if (ST) return ST;
// Value not found. Derive a new type!
- StructTypes->add(STV, ST = new StructType(ETypes));
+ ST = (StructType*) new char[sizeof(StructType) +
+ sizeof(PATypeHandle) * ETypes.size()];
+ new (ST) StructType(ETypes, isPacked);
+ StructTypes->add(STV, ST);
#ifdef DEBUG_MERGE_TYPES
DOUT << "Derived new type: " << *ST << "\n";
return getSubElementHash(PT);
}
- // Subclass should override this... to update self as usual
- void doRefinement(const DerivedType *OldType, const Type *NewType) {
- assert(ValTy == OldType);
- ValTy = NewType;
- }
-
bool operator<(const PointerValType &MTV) const {
return ValTy < MTV.ValTy;
}
DOUT << "DELETEing unused abstract type: <" << *this
<< ">[" << (void*)this << "]" << "\n";
#endif
- delete this; // No users of this abstract type!
+ this->destroy();
}
}
-
// refineAbstractTypeTo - This function is used when it is discovered that
// the 'this' abstract type is actually equivalent to the NewType specified.
// This causes all users of 'this' to switch to reference the more concrete type
// concrete - this could potentially change us from an abstract type to a
// concrete type.
//
-void PackedType::refineAbstractType(const DerivedType *OldType,
+void VectorType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- PackedTypes->RefineAbstractType(this, OldType, NewType);
+ VectorTypes->RefineAbstractType(this, OldType, NewType);
}
-void PackedType::typeBecameConcrete(const DerivedType *AbsTy) {
- PackedTypes->TypeBecameConcrete(this, AbsTy);
+void VectorType::typeBecameConcrete(const DerivedType *AbsTy) {
+ VectorTypes->TypeBecameConcrete(this, AbsTy);
}
// refineAbstractType - Called when a contained type is found to be more
}
bool SequentialType::indexValid(const Value *V) const {
- const Type *Ty = V->getType();
- switch (Ty->getTypeID()) {
- case Type::IntTyID:
- case Type::UIntTyID:
- case Type::LongTyID:
- case Type::ULongTyID:
- return true;
- default:
- return false;
- }
+ if (const IntegerType *IT = dyn_cast<IntegerType>(V->getType()))
+ return IT->getBitWidth() == 32 || IT->getBitWidth() == 64;
+ return false;
}
namespace llvm {
projects / oota-llvm.git / blobdiff