//
// The LLVM Compiler Infrastructure
//
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
-#include "llvm/AbstractTypeUser.h"
#include "llvm/DerivedTypes.h"
#include "llvm/Constants.h"
#include "llvm/ADT/DepthFirstIterator.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Debug.h"
#include <algorithm>
+#include <cstdarg>
using namespace llvm;
// DEBUG_MERGE_TYPES - Enable this #define to see how and when derived types are
static ManagedStatic<std::map<const Type*,
std::string> > AbstractTypeDescriptions;
-Type::Type(const char *Name, TypeID id)
- : ID(id), Abstract(false), SubclassData(0), 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 FloatTyID : return FloatTy;
- case DoubleTyID: return DoubleTy;
- case LabelTyID : return LabelTy;
+ case VoidTyID : return VoidTy;
+ case FloatTyID : return FloatTy;
+ case DoubleTyID : return DoubleTy;
+ case X86_FP80TyID : return X86_FP80Ty;
+ case FP128TyID : return FP128Ty;
+ case PPC_FP128TyID : return PPC_FP128Ty;
+ case LabelTyID : return LabelTy;
default:
return 0;
}
return this;
}
+/// isIntOrIntVector - Return true if this is an integer type or a vector of
+/// integer types.
+///
+bool Type::isIntOrIntVector() const {
+ if (isInteger())
+ return true;
+ if (ID != Type::VectorTyID) return false;
+
+ return cast<VectorType>(this)->getElementType()->isInteger();
+}
+
/// 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::FloatTyID || ID == Type::DoubleTyID ||
+ ID == Type::FP128TyID || ID == Type::X86_FP80TyID ||
+ ID == Type::PPC_FP128TyID)
+ return true;
+ if (ID != Type::VectorTyID) return false;
- return cast<PackedType>(this)->getElementType()->isFloatingPoint();
+ return cast<VectorType>(this)->getElementType()->isFloatingPoint();
}
// canLosslesllyBitCastTo - Return true if this type can be converted to
if (!this->isFirstClassType() || !Ty->isFirstClassType())
return false;
- // Packed -> Packed conversions are always lossless if the two packed types
+ // Vector -> Vector conversions are always lossless if the two vector types
// have the same size, otherwise not.
- if (const PackedType *thisPTy = dyn_cast<PackedType>(this))
- if (const PackedType *thatPTy = dyn_cast<PackedType>(Ty))
+ 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
switch (getTypeID()) {
case Type::FloatTyID: return 32;
case Type::DoubleTyID: return 64;
+ case Type::X86_FP80TyID: return 80;
+ case Type::FP128TyID: return 128;
+ case Type::PPC_FP128TyID: return 128;
case Type::IntegerTyID: return cast<IntegerType>(this)->getBitWidth();
- case Type::PackedTyID: return cast<PackedType>(this)->getBitWidth();
+ case Type::VectorTyID: return cast<VectorType>(this)->getBitWidth();
default: return 0;
}
}
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))
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::X86_FP80TyID:
+ return (*ConcreteTypeDescriptions)[Ty] = "x86_fp80";
+ case Type::FP128TyID: return (*ConcreteTypeDescriptions)[Ty] = "fp128";
+ case Type::PPC_FP128TyID:
+ return (*ConcreteTypeDescriptions)[Ty] = "ppc_fp128";
+ case Type::LabelTyID: return (*ConcreteTypeDescriptions)[Ty] = "label";
+ }
+ }
}
// Check to see if the Type is already on the stack...
if (!Result.empty())
Result += " ";
Result += getTypeDescription(FTy->getReturnType(), TypeStack) + " (";
- unsigned Idx = 1;
for (FunctionType::param_iterator I = FTy->param_begin(),
- E = FTy->param_end(); I != E; ++I) {
+ E = FTy->param_end(); I != E; ++I) {
if (I != FTy->param_begin())
Result += ", ";
- Result += FunctionType::getParamAttrsText(FTy->getParamAttrs(Idx));
- Idx++;
Result += getTypeDescription(*I, TypeStack);
}
if (FTy->isVarArg()) {
Result += "...";
}
Result += ")";
- if (FTy->getParamAttrs(0)) {
- Result += " " + FunctionType::getParamAttrsText(FTy->getParamAttrs(0));
- }
break;
}
- case Type::PackedStructTyID:
case Type::StructTyID: {
const StructType *STy = cast<StructType>(Ty);
if (STy->isPacked())
}
case Type::PointerTyID: {
const PointerType *PTy = cast<PointerType>(Ty);
- Result = getTypeDescription(PTy->getElementType(), TypeStack) + " *";
+ Result = getTypeDescription(PTy->getElementType(), TypeStack);
+ if (unsigned AddressSpace = PTy->getAddressSpace())
+ Result += " addrspace(" + utostr(AddressSpace) + ")";
+ Result += " *";
break;
}
case Type::ArrayTyID: {
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 ";
// 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;
}
// Primitive 'Type' data
//===----------------------------------------------------------------------===//
-const Type *Type::VoidTy = new Type("void", Type::VoidTyID);
-const Type *Type::FloatTy = new Type("float", Type::FloatTyID);
-const Type *Type::DoubleTy = new Type("double", Type::DoubleTyID);
-const Type *Type::LabelTy = new Type("label", Type::LabelTyID);
+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::X86_FP80Ty = new Type(Type::X86_FP80TyID);
+const Type *Type::FP128Ty = new Type(Type::FP128TyID);
+const Type *Type::PPC_FP128Ty = new Type(Type::PPC_FP128TyID);
+const Type *Type::LabelTy = new Type(Type::LabelTyID);
namespace {
struct BuiltinIntegerType : public IntegerType {
// Derived Type Constructors
//===----------------------------------------------------------------------===//
+/// isValidReturnType - Return true if the specified type is valid as a return
+/// type.
+bool FunctionType::isValidReturnType(const Type *RetTy) {
+ if (RetTy->isFirstClassType())
+ return true;
+ if (RetTy == Type::VoidTy || isa<OpaqueType>(RetTy))
+ return true;
+
+ // If this is a multiple return case, verify that each return is a first class
+ // value and that there is at least one value.
+ const StructType *SRetTy = dyn_cast<StructType>(RetTy);
+ if (SRetTy == 0 || SRetTy->getNumElements() == 0)
+ return false;
+
+ for (unsigned i = 0, e = SRetTy->getNumElements(); i != e; ++i)
+ if (!SRetTy->getElementType(i)->isFirstClassType())
+ return false;
+ return true;
+}
+
FunctionType::FunctionType(const Type *Result,
const std::vector<const Type*> &Params,
- bool IsVarArgs, const ParamAttrsList &Attrs)
+ bool IsVarArgs)
: DerivedType(FunctionTyID), isVarArgs(IsVarArgs) {
- assert((Result->isFirstClassType() || Result == Type::VoidTy ||
- isa<OpaqueType>(Result)) &&
- "LLVM functions cannot return aggregates");
+ ContainedTys = reinterpret_cast<PATypeHandle*>(this+1);
+ NumContainedTys = Params.size() + 1; // + 1 for result type
+ assert(isValidReturnType(Result) && "invalid return type for function");
+
+
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();
}
- // Set the ParameterAttributes
- if (!Attrs.empty())
- ParamAttrs = new ParamAttrsList(Attrs);
- else
- ParamAttrs = 0;
-
// Calculate whether or not this type is abstract
setAbstract(isAbstract);
-
}
StructType::StructType(const std::vector<const Type*> &Types, bool isPacked)
: CompositeType(StructTyID) {
+ ContainedTys = reinterpret_cast<PATypeHandle*>(this + 1);
+ NumContainedTys = Types.size();
setSubclassData(isPacked);
- ContainedTys.reserve(Types.size());
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 PackedType must be greater than 0");
+ 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");
+
}
-PointerType::PointerType(const Type *E) : SequentialType(PointerTyID, E) {
+PointerType::PointerType(const Type *E, unsigned AddrSpace)
+ : SequentialType(PointerTyID, E) {
+ AddressSpace = AddrSpace;
// Calculate whether or not this type is abstract
setAbstract(E->isAbstract());
}
// 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)
+ for (unsigned i = 1, e = NumContainedTys; i != e; ++i)
ContainedTys[i] = Type::Int32Ty;
}
}
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);
+ const PointerType *PTy2 = cast<PointerType>(Ty2);
+ return PTy->getAddressSpace() == PTy2->getAddressSpace() &&
+ TypesEqual(PTy->getElementType(), PTy2->getElementType(), EqTypes);
} else if (const StructType *STy = dyn_cast<StructType>(Ty)) {
const StructType *STy2 = cast<StructType>(Ty2);
if (STy->getNumElements() != STy2->getNumElements()) 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)) {
const FunctionType *FTy2 = cast<FunctionType>(Ty2);
if (FTy->isVarArg() != FTy2->isVarArg() ||
FTy->getNumParams() != FTy2->getNumParams() ||
- FTy->getNumAttrs() != FTy2->getNumAttrs() ||
- FTy->getParamAttrs(0) != FTy2->getParamAttrs(0) ||
!TypesEqual(FTy->getReturnType(), FTy2->getReturnType(), EqTypes))
return false;
for (unsigned i = 0, e = FTy2->getNumParams(); i != e; ++i) {
- if (FTy->getParamAttrs(i+1) != FTy->getParamAttrs(i+1))
- return false;
if (!TypesEqual(FTy->getParamType(i), FTy2->getParamType(i), EqTypes))
return false;
}
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();
break;
+ case Type::PointerTyID:
+ HashVal ^= cast<PointerType>(SubTy)->getAddressSpace();
+ break;
}
}
return HashVal ? HashVal : 1; // Do not return zero unless opaque subty.
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);
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;
- std::vector<FunctionType::ParameterAttributes> ParamAttrs;
bool isVarArg;
public:
FunctionValType(const Type *ret, const std::vector<const Type*> &args,
- bool IVA, const FunctionType::ParamAttrsList &attrs)
- : RetTy(ret), isVarArg(IVA) {
- for (unsigned i = 0; i < args.size(); ++i)
- ArgTypes.push_back(args[i]);
- for (unsigned i = 0; i < attrs.size(); ++i)
- ParamAttrs.push_back(attrs[i]);
- }
+ bool isVA) : RetTy(ret), ArgTypes(args), isVarArg(isVA) {}
static FunctionValType get(const FunctionType *FT);
static unsigned hashTypeStructure(const FunctionType *FT) {
- return FT->getNumParams()*64+FT->getNumAttrs()*2+FT->isVarArg();
+ unsigned Result = FT->getNumParams()*2 + FT->isVarArg();
+ return Result;
}
inline bool operator<(const FunctionValType &MTV) const {
if (isVarArg < MTV.isVarArg) return true;
if (isVarArg > MTV.isVarArg) return false;
if (ArgTypes < MTV.ArgTypes) return true;
- return ArgTypes == MTV.ArgTypes && ParamAttrs < MTV.ParamAttrs;
+ if (ArgTypes > MTV.ArgTypes) return false;
+ return false;
}
};
}
FunctionValType FunctionValType::get(const FunctionType *FT) {
// Build up a FunctionValType
std::vector<const Type *> ParamTypes;
- std::vector<FunctionType::ParameterAttributes> ParamAttrs;
ParamTypes.reserve(FT->getNumParams());
for (unsigned i = 0, e = FT->getNumParams(); i != e; ++i)
ParamTypes.push_back(FT->getParamType(i));
- for (unsigned i = 0, e = FT->getNumAttrs(); i != e; ++i)
- ParamAttrs.push_back(FT->getParamAttrs(i));
- return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg(),
- ParamAttrs);
+ return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg());
}
// FunctionType::get - The factory function for the FunctionType class...
FunctionType *FunctionType::get(const Type *ReturnType,
const std::vector<const Type*> &Params,
- bool isVarArg,
- const std::vector<ParameterAttributes> &Attrs) {
- bool noAttrs = true;
- for (unsigned i = 0, e = Attrs.size(); i < e; ++i)
- if (Attrs[i] != FunctionType::NoAttributeSet) {
- noAttrs = false;
- break;
- }
- const std::vector<FunctionType::ParameterAttributes> NullAttrs;
- const std::vector<FunctionType::ParameterAttributes> *TheAttrs = &Attrs;
- if (noAttrs)
- TheAttrs = &NullAttrs;
- FunctionValType VT(ReturnType, Params, isVarArg, *TheAttrs);
- FunctionType *MT = FunctionTypes->get(VT);
- if (MT) return MT;
+ bool isVarArg) {
+ FunctionValType VT(ReturnType, Params, isVarArg);
+ FunctionType *FT = FunctionTypes->get(VT);
+ if (FT)
+ return FT;
- MT = new FunctionType(ReturnType, Params, isVarArg, *TheAttrs);
- FunctionTypes->add(VT, MT);
+ FT = (FunctionType*) new char[sizeof(FunctionType) +
+ sizeof(PATypeHandle)*(Params.size()+1)];
+ new (FT) FunctionType(ReturnType, Params, isVarArg);
+ FunctionTypes->add(VT, FT);
#ifdef DEBUG_MERGE_TYPES
- DOUT << "Derived new type: " << MT << "\n";
+ DOUT << "Derived new type: " << FT << "\n";
#endif
- return MT;
-}
-
-FunctionType::ParameterAttributes
-FunctionType::getParamAttrs(unsigned Idx) const {
- if (!ParamAttrs)
- return NoAttributeSet;
- if (Idx >= ParamAttrs->size())
- return NoAttributeSet;
- return (*ParamAttrs)[Idx];
-}
-
-std::string FunctionType::getParamAttrsText(ParameterAttributes Attr) {
- std::string Result;
- if (Attr & ZExtAttribute)
- Result += "zext ";
- if (Attr & SExtAttribute)
- Result += "sext ";
- if (Attr & NoReturnAttribute)
- Result += "noreturn ";
- if (Attr & InRegAttribute)
- Result += "inreg ";
- if (Attr & StructRetAttribute)
- Result += "sret ";
- return Result;
+ return FT;
}
//===----------------------------------------------------------------------===//
//===----------------------------------------------------------------------===//
-// 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();
}
- 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!");
- assert(isPowerOf2_32(NumElements) && "Vector length should be a power of 2!");
+VectorType *VectorType::get(const Type *ElementType, unsigned NumElements) {
+ assert(ElementType && "Can't get vector of null types!");
- 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";
if (ST) return ST;
// Value not found. Derive a new type!
- StructTypes->add(STV, ST = new StructType(ETypes, isPacked));
+ 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 ST;
}
+StructType *StructType::get(const Type *type, ...) {
+ va_list ap;
+ std::vector<const llvm::Type*> StructFields;
+ va_start(ap, type);
+ while (type) {
+ StructFields.push_back(type);
+ type = va_arg(ap, llvm::Type*);
+ }
+ return llvm::StructType::get(StructFields);
+}
+
//===----------------------------------------------------------------------===//
namespace llvm {
class PointerValType {
const Type *ValTy;
+ unsigned AddressSpace;
public:
- PointerValType(const Type *val) : ValTy(val) {}
+ PointerValType(const Type *val, unsigned as) : ValTy(val), AddressSpace(as) {}
static PointerValType get(const PointerType *PT) {
- return PointerValType(PT->getElementType());
+ return PointerValType(PT->getElementType(), PT->getAddressSpace());
}
static unsigned hashTypeStructure(const PointerType *PT) {
}
bool operator<(const PointerValType &MTV) const {
- return ValTy < MTV.ValTy;
+ if (AddressSpace < MTV.AddressSpace) return true;
+ return AddressSpace == MTV.AddressSpace && ValTy < MTV.ValTy;
}
};
}
static ManagedStatic<TypeMap<PointerValType, PointerType> > PointerTypes;
-PointerType *PointerType::get(const Type *ValueType) {
+PointerType *PointerType::get(const Type *ValueType, unsigned AddressSpace) {
assert(ValueType && "Can't get a pointer to <null> type!");
assert(ValueType != Type::VoidTy &&
"Pointer to void is not valid, use sbyte* instead!");
assert(ValueType != Type::LabelTy && "Pointer to label is not valid!");
- PointerValType PVT(ValueType);
+ PointerValType PVT(ValueType, AddressSpace);
PointerType *PT = PointerTypes->get(PVT);
if (PT) return PT;
// Value not found. Derive a new type!
- PointerTypes->add(PVT, PT = new PointerType(ValueType));
+ PointerTypes->add(PVT, PT = new PointerType(ValueType, AddressSpace));
#ifdef DEBUG_MERGE_TYPES
DOUT << "Derived new type: " << *PT << "\n";
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
projects / oota-llvm.git / blobdiff