//===-- Type.cpp - Implement the Type class -------------------------------===//
-//
+//
// 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 implements the Type class for the VMCore library.
#include "llvm/AbstractTypeUser.h"
#include "llvm/DerivedTypes.h"
-#include "llvm/SymbolTable.h"
#include "llvm/Constants.h"
#include "llvm/ADT/DepthFirstIterator.h"
#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/SCCIterator.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/Compiler.h"
+#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/Debug.h"
#include <algorithm>
-#include <iostream>
using namespace llvm;
// DEBUG_MERGE_TYPES - Enable this #define to see how and when derived types are
// 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() {}
+
+//===----------------------------------------------------------------------===//
+// Type PATypeHolder Implementation
+//===----------------------------------------------------------------------===//
+
+/// get - This implements the forwarding part of the union-find algorithm for
+/// abstract types. Before every access to the Type*, we check to see if the
+/// type we are pointing to is forwarding to a new type. If so, we drop our
+/// reference to the type.
+///
+Type* PATypeHolder::get() const {
+ const Type *NewTy = Ty->getForwardedType();
+ if (!NewTy) return const_cast<Type*>(Ty);
+ return *const_cast<PATypeHolder*>(this) = NewTy;
+}
+
//===----------------------------------------------------------------------===//
// Type Class Implementation
//===----------------------------------------------------------------------===//
// for types as they are needed. Because resolution of types must invalidate
// all of the abstract type descriptions, we keep them in a seperate map to make
// this easy.
-static std::map<const Type*, std::string> ConcreteTypeDescriptions;
-static std::map<const Type*, std::string> AbstractTypeDescriptions;
-
-Type::Type( const std::string& name, TypeID id )
- : RefCount(0), ForwardType(0) {
- if (!name.empty())
- ConcreteTypeDescriptions[this] = name;
- ID = id;
- Abstract = false;
+static ManagedStatic<std::map<const Type*,
+ std::string> > ConcreteTypeDescriptions;
+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;
}
+
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;
}
}
-// isLosslesslyConvertibleTo - 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;
- 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
- }
+const Type *Type::getVAArgsPromotedType() const {
+ if (ID == IntegerTyID && getSubclassData() < 32)
+ return Type::Int32Ty;
+ else if (ID == FloatTyID)
+ return Type::DoubleTy;
+ else
+ return this;
}
-/// 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;
- }
+/// 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::VectorTyID) return false;
+
+ return cast<VectorType>(this)->getElementType()->isFloatingPoint();
}
-/// 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;
- }
-}
+// canLosslesllyBitCastTo - Return true if this type can be converted to
+// 'Ty' without any reinterpretation of bits. For example, uint to int.
+//
+bool Type::canLosslesslyBitCastTo(const Type *Ty) const {
+ // Identity cast means no change so return true
+ if (this == Ty)
+ return true;
+
+ // They are not convertible unless they are at least first class types
+ if (!this->isFirstClassType() || !Ty->isFirstClassType())
+ return false;
+ // 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
+}
-// 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 {
+unsigned Type::getPrimitiveSizeInBits() const {
switch (getTypeID()) {
-#define HANDLE_PRIM_TYPE(TY,SIZE) case TY##TyID: return SIZE;
-#include "llvm/Type.def"
+ 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 (!isa<StructType>(this)) return false;
+ if (const VectorType *PTy = dyn_cast<VectorType>(this))
+ return PTy->getElementType()->isSized();
+
+ 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;
}
/// algorithm for when a type is being forwarded to another type.
const Type *Type::getForwardedTypeInternal() const {
assert(ForwardType && "This type is not being forwarded to another type!");
-
+
// Check to see if the forwarded type has been forwarded on. If so, collapse
// the forwarding links.
const Type *RealForwardedType = ForwardType->getForwardedType();
// Now drop the old reference. This could cause ForwardType to get deleted.
cast<DerivedType>(ForwardType)->dropRef();
-
+
// Return the updated type.
ForwardType = RealForwardedType;
return ForwardType;
}
+void Type::refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
+ abort();
+}
+void Type::typeBecameConcrete(const DerivedType *AbsTy) {
+ abort();
+}
+
+
// getTypeDescription - This is a recursive function that walks a type hierarchy
// calculating the description for a type.
//
std::vector<const Type *> &TypeStack) {
if (isa<OpaqueType>(Ty)) { // Base case for the recursion
std::map<const Type*, std::string>::iterator I =
- AbstractTypeDescriptions.lower_bound(Ty);
- if (I != AbstractTypeDescriptions.end() && I->first == Ty)
+ AbstractTypeDescriptions->lower_bound(Ty);
+ if (I != AbstractTypeDescriptions->end() && I->first == Ty)
return I->second;
std::string Desc = "opaque";
- AbstractTypeDescriptions.insert(std::make_pair(Ty, Desc));
+ AbstractTypeDescriptions->insert(std::make_pair(Ty, Desc));
return Desc;
}
-
+
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;
+ ConcreteTypeDescriptions->find(Ty);
+ if (I != ConcreteTypeDescriptions->end()) return I->second;
}
-
+
// Check to see if the Type is already on the stack...
unsigned Slot = 0, CurSize = TypeStack.size();
while (Slot < CurSize && TypeStack[Slot] != Ty) ++Slot; // Scan for type
-
- // This is another base case for the recursion. In this case, we know
+
+ // This is another base case for the recursion. In this case, we know
// that we have looped back to a type that we have previously visited.
// Generate the appropriate upreference to handle this.
- //
+ //
if (Slot < CurSize)
return "\\" + utostr(CurSize-Slot); // Here's the upreference
// Recursive case: derived types...
std::string Result;
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;
for (FunctionType::param_iterator I = FTy->param_begin(),
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);
- 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 ";
const Type *Ty) {
std::map<const Type*, std::string>::iterator I = Map.find(Ty);
if (I != Map.end()) return I->second;
-
+
std::vector<const Type *> TypeStack;
- return Map[Ty] = getTypeDescription(Ty, TypeStack);
+ std::string Result = getTypeDescription(Ty, TypeStack);
+ return Map[Ty] = Result;
}
const std::string &Type::getDescription() const {
if (isAbstract())
- return getOrCreateDesc(AbstractTypeDescriptions, this);
+ return getOrCreateDesc(*AbstractTypeDescriptions, this);
else
- return getOrCreateDesc(ConcreteTypeDescriptions, this);
+ return getOrCreateDesc(*ConcreteTypeDescriptions, this);
}
bool StructType::indexValid(const Value *V) const {
- // Structure indexes require unsigned integer constants.
- if (V->getType() == Type::UIntTy)
- if (const ConstantUInt *CU = dyn_cast<ConstantUInt>(V))
- return CU->getValue() < ContainedTys.size();
+ // 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 false;
}
//
const Type *StructType::getTypeAtIndex(const Value *V) const {
assert(indexValid(V) && "Invalid structure index!");
- unsigned Idx = (unsigned)cast<ConstantUInt>(V)->getValue();
+ unsigned Idx = (unsigned)cast<ConstantInt>(V)->getZExtValue();
return ContainedTys[Idx];
}
-
//===----------------------------------------------------------------------===//
-// Static 'Type' data
+// 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);
+
namespace {
- struct PrimType : public Type {
- PrimType(const char *S, TypeID ID) : Type(S, ID) {}
+ struct BuiltinIntegerType : public IntegerType {
+ BuiltinIntegerType(unsigned W) : IntegerType(W) {}
};
}
-
-static PrimType TheVoidTy ("void" , Type::VoidTyID);
-static PrimType TheBoolTy ("bool" , Type::BoolTyID);
-static PrimType TheSByteTy ("sbyte" , Type::SByteTyID);
-static PrimType TheUByteTy ("ubyte" , Type::UByteTyID);
-static PrimType TheShortTy ("short" , Type::ShortTyID);
-static PrimType TheUShortTy("ushort", Type::UShortTyID);
-static PrimType TheIntTy ("int" , Type::IntTyID);
-static PrimType TheUIntTy ("uint" , Type::UIntTyID);
-static PrimType TheLongTy ("long" , Type::LongTyID);
-static PrimType TheULongTy ("ulong" , Type::ULongTyID);
-static PrimType TheFloatTy ("float" , Type::FloatTyID);
-static PrimType TheDoubleTy("double", Type::DoubleTyID);
-static PrimType TheLabelTy ("label" , Type::LabelTyID);
-
-Type *Type::VoidTy = &TheVoidTy;
-Type *Type::BoolTy = &TheBoolTy;
-Type *Type::SByteTy = &TheSByteTy;
-Type *Type::UByteTy = &TheUByteTy;
-Type *Type::ShortTy = &TheShortTy;
-Type *Type::UShortTy = &TheUShortTy;
-Type *Type::IntTy = &TheIntTy;
-Type *Type::UIntTy = &TheUIntTy;
-Type *Type::LongTy = &TheLongTy;
-Type *Type::ULongTy = &TheULongTy;
-Type *Type::FloatTy = &TheFloatTy;
-Type *Type::DoubleTy = &TheDoubleTy;
-Type *Type::LabelTy = &TheLabelTy;
+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) {
+ const std::vector<const Type*> &Params,
+ bool IsVarArgs, const ParamAttrsList &Attrs)
+ : DerivedType(FunctionTyID), isVarArgs(IsVarArgs) {
assert((Result->isFirstClassType() || Result == Type::VoidTy ||
- isa<OpaqueType>(Result)) &&
+ isa<OpaqueType>(Result)) &&
"LLVM functions cannot return aggregates");
bool isAbstract = Result->isAbstract();
ContainedTys.reserve(Params.size()+1);
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)
+StructType::StructType(const std::vector<const Type*> &Types, bool isPacked)
: CompositeType(StructTyID) {
+ setSubclassData(isPacked);
ContainedTys.reserve(Types.size());
bool isAbstract = false;
for (unsigned i = 0; i < Types.size(); ++i) {
setAbstract(isAbstract);
}
-ArrayType::ArrayType(const Type *ElType, unsigned NumEl)
+ArrayType::ArrayType(const Type *ElType, uint64_t NumEl)
: SequentialType(ArrayTyID, ElType) {
NumElements = NumEl;
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");
}
OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {
setAbstract(true);
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "Derived new type: " << *this << "\n";
+ DOUT << "Derived new type: " << *this << "\n";
#endif
}
// types, to avoid some circular reference problems.
void DerivedType::dropAllTypeUses() {
if (!ContainedTys.empty()) {
- while (ContainedTys.size() > 1)
- ContainedTys.pop_back();
-
// 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
+ // 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::Int32Ty;
}
}
-// isTypeAbstract - This is a recursive function that walks a type hierarchy
-// calculating whether or not a type is abstract. Worst case it will have to do
-// a lot of traversing if you have some whacko opaque types, but in most cases,
-// it will do some simple stuff when it hits non-abstract types that aren't
-// recursive.
-//
-bool Type::isTypeAbstract() {
- if (!isAbstract()) // Base case for the recursion
- return false; // Primitive = leaf type
-
- if (isa<OpaqueType>(this)) // Base case for the recursion
- return true; // This whole type is abstract!
-
- // We have to guard against recursion. To do this, we temporarily mark this
- // type as concrete, so that if we get back to here recursively we will think
- // it's not abstract, and thus not scan it again.
- setAbstract(false);
-
- // Scan all of the sub-types. If any of them are abstract, than so is this
- // one!
- for (Type::subtype_iterator I = subtype_begin(), E = subtype_end();
- I != E; ++I)
- if (const_cast<Type*>(I->get())->isTypeAbstract()) {
- setAbstract(true); // Restore the abstract bit.
- return true; // This type is abstract if subtype is abstract!
+
+
+/// TypePromotionGraph and graph traits - this is designed to allow us to do
+/// efficient SCC processing of type graphs. This is the exact same as
+/// GraphTraits<Type*>, except that we pretend that concrete types have no
+/// children to avoid processing them.
+struct TypePromotionGraph {
+ Type *Ty;
+ TypePromotionGraph(Type *T) : Ty(T) {}
+};
+
+namespace llvm {
+ template <> struct GraphTraits<TypePromotionGraph> {
+ typedef Type NodeType;
+ typedef Type::subtype_iterator ChildIteratorType;
+
+ static inline NodeType *getEntryNode(TypePromotionGraph G) { return G.Ty; }
+ static inline ChildIteratorType child_begin(NodeType *N) {
+ if (N->isAbstract())
+ return N->subtype_begin();
+ else // No need to process children of concrete types.
+ return N->subtype_end();
}
-
- // Restore the abstract bit.
- setAbstract(true);
+ static inline ChildIteratorType child_end(NodeType *N) {
+ return N->subtype_end();
+ }
+ };
+}
- // Nothing looks abstract here...
- return false;
+
+// PromoteAbstractToConcrete - This is a recursive function that walks a type
+// graph calculating whether or not a type is abstract.
+//
+void Type::PromoteAbstractToConcrete() {
+ if (!isAbstract()) return;
+
+ scc_iterator<TypePromotionGraph> SI = scc_begin(TypePromotionGraph(this));
+ scc_iterator<TypePromotionGraph> SE = scc_end (TypePromotionGraph(this));
+
+ for (; SI != SE; ++SI) {
+ std::vector<Type*> &SCC = *SI;
+
+ // Concrete types are leaves in the tree. Since an SCC will either be all
+ // abstract or all concrete, we only need to check one type.
+ if (SCC[0]->isAbstract()) {
+ if (isa<OpaqueType>(SCC[0]))
+ return; // Not going to be concrete, sorry.
+
+ // If all of the children of all of the types in this SCC are concrete,
+ // then this SCC is now concrete as well. If not, neither this SCC, nor
+ // any parent SCCs will be concrete, so we might as well just exit.
+ for (unsigned i = 0, e = SCC.size(); i != e; ++i)
+ for (Type::subtype_iterator CI = SCC[i]->subtype_begin(),
+ E = SCC[i]->subtype_end(); CI != E; ++CI)
+ if ((*CI)->isAbstract())
+ // If the child type is in our SCC, it doesn't make the entire SCC
+ // abstract unless there is a non-SCC abstract type.
+ if (std::find(SCC.begin(), SCC.end(), *CI) == SCC.end())
+ return; // Not going to be concrete, sorry.
+
+ // Okay, we just discovered this whole SCC is now concrete, mark it as
+ // such!
+ for (unsigned i = 0, e = SCC.size(); i != e; ++i) {
+ assert(SCC[i]->isAbstract() && "Why are we processing concrete types?");
+
+ SCC[i]->setAbstract(false);
+ }
+
+ for (unsigned i = 0, e = SCC.size(); i != e; ++i) {
+ assert(!SCC[i]->isAbstract() && "Concrete type became abstract?");
+ // The type just became concrete, notify all users!
+ cast<DerivedType>(SCC[i])->notifyUsesThatTypeBecameConcrete();
+ }
+ }
+ }
}
// 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)) {
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)
+ 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;
+ }
return true;
} else {
assert(0 && "Unknown derived type!");
return TypesEqual(Ty, Ty2, EqTypes);
}
-// TypeHasCycleThrough - Return true there is a path from CurTy to TargetTy in
-// the type graph. We know that Ty is an abstract type, so if we ever reach a
-// non-abstract type, we know that we don't need to search the subgraph.
-static bool TypeHasCycleThrough(const Type *TargetTy, const Type *CurTy,
+// AbstractTypeHasCycleThrough - Return true there is a path from CurTy to
+// TargetTy in the type graph. We know that Ty is an abstract type, so if we
+// ever reach a non-abstract type, we know that we don't need to search the
+// subgraph.
+static bool AbstractTypeHasCycleThrough(const Type *TargetTy, const Type *CurTy,
std::set<const Type*> &VisitedTypes) {
if (TargetTy == CurTy) return true;
if (!CurTy->isAbstract()) return false;
- std::set<const Type*>::iterator VTI = VisitedTypes.lower_bound(CurTy);
- if (VTI != VisitedTypes.end() && *VTI == CurTy)
- return false;
- VisitedTypes.insert(VTI, CurTy);
+ if (!VisitedTypes.insert(CurTy).second)
+ return false; // Already been here.
- for (Type::subtype_iterator I = CurTy->subtype_begin(),
+ for (Type::subtype_iterator I = CurTy->subtype_begin(),
E = CurTy->subtype_end(); I != E; ++I)
- if (TypeHasCycleThrough(TargetTy, *I, VisitedTypes))
+ if (AbstractTypeHasCycleThrough(TargetTy, *I, VisitedTypes))
return true;
return false;
}
+static bool ConcreteTypeHasCycleThrough(const Type *TargetTy, const Type *CurTy,
+ std::set<const Type*> &VisitedTypes) {
+ if (TargetTy == CurTy) return true;
+
+ if (!VisitedTypes.insert(CurTy).second)
+ return false; // Already been here.
+
+ for (Type::subtype_iterator I = CurTy->subtype_begin(),
+ E = CurTy->subtype_end(); I != E; ++I)
+ if (ConcreteTypeHasCycleThrough(TargetTy, *I, VisitedTypes))
+ return true;
+ return false;
+}
/// TypeHasCycleThroughItself - Return true if the specified type has a cycle
/// back to itself.
static bool TypeHasCycleThroughItself(const Type *Ty) {
- assert(Ty->isAbstract() && "This code assumes that Ty was abstract!");
std::set<const Type*> VisitedTypes;
- for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
- I != E; ++I)
- if (TypeHasCycleThrough(Ty, *I, VisitedTypes))
- return true;
+
+ if (Ty->isAbstract()) { // Optimized case for abstract types.
+ for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
+ I != E; ++I)
+ if (AbstractTypeHasCycleThrough(Ty, *I, VisitedTypes))
+ return true;
+ } else {
+ for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
+ I != E; ++I)
+ if (ConcreteTypeHasCycleThrough(Ty, *I, VisitedTypes))
+ return true;
+ }
return false;
}
+/// getSubElementHash - Generate a hash value for all of the SubType's of this
+/// type. The hash value is guaranteed to be zero if any of the subtypes are
+/// an opaque type. Otherwise we try to mix them in as well as possible, but do
+/// not look at the subtype's subtype's.
+static unsigned getSubElementHash(const Type *Ty) {
+ unsigned HashVal = 0;
+ for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
+ I != E; ++I) {
+ HashVal *= 32;
+ const Type *SubTy = I->get();
+ HashVal += SubTy->getTypeID();
+ 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();
+ break;
+ case Type::ArrayTyID:
+ HashVal ^= cast<ArrayType>(SubTy)->getNumElements();
+ break;
+ case Type::VectorTyID:
+ HashVal ^= cast<VectorType>(SubTy)->getNumElements();
+ break;
+ case Type::StructTyID:
+ HashVal ^= cast<StructType>(SubTy)->getNumElements();
+ break;
+ }
+ }
+ return HashVal ? HashVal : 1; // Do not return zero unless opaque subty.
+}
//===----------------------------------------------------------------------===//
// Derived Type Factory Functions
//===----------------------------------------------------------------------===//
+namespace llvm {
+class TypeMapBase {
+protected:
+ /// TypesByHash - Keep track of types by their structure hash value. Note
+ /// that we only keep track of types that have cycles through themselves in
+ /// this map.
+ ///
+ std::multimap<unsigned, PATypeHolder> TypesByHash;
+
+public:
+ void RemoveFromTypesByHash(unsigned Hash, const Type *Ty) {
+ std::multimap<unsigned, PATypeHolder>::iterator I =
+ TypesByHash.lower_bound(Hash);
+ for (; I != TypesByHash.end() && I->first == Hash; ++I) {
+ if (I->second == Ty) {
+ TypesByHash.erase(I);
+ return;
+ }
+ }
+
+ // This must be do to an opaque type that was resolved. Switch down to hash
+ // code of zero.
+ assert(Hash && "Didn't find type entry!");
+ RemoveFromTypesByHash(0, Ty);
+ }
+
+ /// TypeBecameConcrete - When Ty gets a notification that TheType just became
+ /// concrete, drop uses and make Ty non-abstract if we should.
+ void TypeBecameConcrete(DerivedType *Ty, const DerivedType *TheType) {
+ // If the element just became concrete, remove 'ty' from the abstract
+ // type user list for the type. Do this for as many times as Ty uses
+ // OldType.
+ for (Type::subtype_iterator I = Ty->subtype_begin(), E = Ty->subtype_end();
+ I != E; ++I)
+ if (I->get() == TheType)
+ TheType->removeAbstractTypeUser(Ty);
+
+ // If the type is currently thought to be abstract, rescan all of our
+ // subtypes to see if the type has just become concrete! Note that this
+ // may send out notifications to AbstractTypeUsers that types become
+ // concrete.
+ if (Ty->isAbstract())
+ Ty->PromoteAbstractToConcrete();
+ }
+};
+}
+
+
// TypeMap - Make sure that only one instance of a particular type may be
// created on any given run of the compiler... note that this involves updating
// our map if an abstract type gets refined somehow.
//
namespace llvm {
template<class ValType, class TypeClass>
-class TypeMap {
+class TypeMap : public TypeMapBase {
std::map<ValType, PATypeHolder> Map;
-
- /// TypesByHash - Keep track of each type by its structure hash value.
- ///
- std::multimap<unsigned, PATypeHolder> TypesByHash;
public:
typedef typename std::map<ValType, PATypeHolder>::iterator iterator;
~TypeMap() { print("ON EXIT"); }
TypesByHash.insert(std::make_pair(ValType::hashTypeStructure(Ty), Ty));
print("add");
}
-
- void RemoveFromTypesByHash(unsigned Hash, const Type *Ty) {
- std::multimap<unsigned, PATypeHolder>::iterator I =
- TypesByHash.lower_bound(Hash);
- while (I->second != Ty) {
- ++I;
- assert(I != TypesByHash.end() && I->first == Hash);
- }
- TypesByHash.erase(I);
- }
-
- /// finishRefinement - This method is called after we have updated an existing
- /// type with its new components. We must now either merge the type away with
+
+ /// 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.
- /// The specified iterator tells us what the type USED to look like.
- void finishRefinement(TypeClass *Ty, const DerivedType *OldType,
+ void RefineAbstractType(TypeClass *Ty, const DerivedType *OldType,
const Type *NewType) {
- assert((Ty->isAbstract() || !OldType->isAbstract()) &&
- "Refining a non-abstract type!");
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "refineAbstractTy(" << (void*)OldType << "[" << *OldType
- << "], " << (void*)NewType << " [" << *NewType << "])\n";
+ DOUT << "RefineAbstractType(" << (void*)OldType << "[" << *OldType
+ << "], " << (void*)NewType << " [" << *NewType << "])\n";
#endif
+
+ // Otherwise, we are changing one subelement type into another. Clearly the
+ // OldType must have been abstract, making us abstract.
+ assert(Ty->isAbstract() && "Refining a non-abstract type!");
+ assert(OldType != NewType);
// Make a temporary type holder for the type so that it doesn't disappear on
// us when we erase the entry from the map.
// The old record is now out-of-date, because one of the children has been
// updated. Remove the obsolete entry from the map.
- Map.erase(ValType::get(Ty));
+ unsigned NumErased = Map.erase(ValType::get(Ty));
+ assert(NumErased && "Element not found!");
// Remember the structural hash for the type before we start hacking on it,
- // in case we need it later. Also, check to see if the type HAD a cycle
- // through it, if so, we know it will when we hack on it.
+ // in case we need it later.
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)
- if (Ty->ContainedTys[i] == OldType) {
- Ty->ContainedTys[i].removeUserFromConcrete();
+ if (Ty->ContainedTys[i] == OldType)
Ty->ContainedTys[i] = NewType;
- }
-
- unsigned TypeHash = ValType::hashTypeStructure(Ty);
+ unsigned NewTypeHash = ValType::hashTypeStructure(Ty);
// If there are no cycles going through this node, we can do a simple,
// efficient lookup in the map, instead of an inefficient nasty linear
// lookup.
- bool TypeHasCycle = Ty->isAbstract() && TypeHasCycleThroughItself(Ty);
- if (!TypeHasCycle) {
- iterator I = Map.find(ValType::get(Ty));
- if (I != Map.end()) {
+ if (!TypeHasCycleThroughItself(Ty)) {
+ typename std::map<ValType, PATypeHolder>::iterator I;
+ bool Inserted;
+
+ tie(I, Inserted) = Map.insert(std::make_pair(ValType::get(Ty), Ty));
+ if (!Inserted) {
+ // Refined to a different type altogether?
+ RemoveFromTypesByHash(OldTypeHash, Ty);
+
// We already have this type in the table. Get rid of the newly refined
// type.
- assert(Ty->isAbstract() && "Replacing a non-abstract type?");
TypeClass *NewTy = cast<TypeClass>((Type*)I->second.get());
-
- // Refined to a different type altogether?
- RemoveFromTypesByHash(TypeHash, Ty);
Ty->refineAbstractTypeTo(NewTy);
return;
}
-
} else {
// Now we check to see if there is an existing entry in the table which is
// structurally identical to the newly refined type. If so, this type
// gets refined to the pre-existing type.
//
- std::multimap<unsigned, PATypeHolder>::iterator I,E, Entry;
- tie(I, E) = TypesByHash.equal_range(TypeHash);
+ std::multimap<unsigned, PATypeHolder>::iterator I, E, Entry;
+ tie(I, E) = TypesByHash.equal_range(NewTypeHash);
Entry = E;
for (; I != E; ++I) {
- if (I->second != Ty) {
+ if (I->second == Ty) {
+ // Remember the position of the old type if we see it in our scan.
+ Entry = I;
+ } else {
if (TypesEqual(Ty, I->second)) {
- assert(Ty->isAbstract() && "Replacing a non-abstract type?");
TypeClass *NewTy = cast<TypeClass>((Type*)I->second.get());
-
- if (Entry == E) {
- // Find the location of Ty in the TypesByHash structure.
- while (I->second != Ty) {
- ++I;
- assert(I != E && "Structure doesn't contain type??");
+
+ // Remove the old entry form TypesByHash. If the hash values differ
+ // now, remove it from the old place. Otherwise, continue scanning
+ // withing this hashcode to reduce work.
+ if (NewTypeHash != OldTypeHash) {
+ RemoveFromTypesByHash(OldTypeHash, Ty);
+ } else {
+ if (Entry == E) {
+ // Find the location of Ty in the TypesByHash structure if we
+ // haven't seen it already.
+ while (I->second != Ty) {
+ ++I;
+ assert(I != E && "Structure doesn't contain type??");
+ }
+ Entry = I;
}
- Entry = I;
+ TypesByHash.erase(Entry);
}
-
- TypesByHash.erase(Entry);
Ty->refineAbstractTypeTo(NewTy);
return;
}
- } else {
- // Remember the position of
- Entry = I;
}
}
+
+ // If there is no existing type of the same structure, we reinsert an
+ // updated record into the map.
+ Map.insert(std::make_pair(ValType::get(Ty), Ty));
}
- // If we succeeded, we need to insert the type into the cycletypes table.
- // There are several cases here, depending on whether the original type
- // had the same hash code and was itself cyclic.
- if (TypeHash != OldTypeHash) {
+ // If the hash codes differ, update TypesByHash
+ if (NewTypeHash != OldTypeHash) {
RemoveFromTypesByHash(OldTypeHash, Ty);
- TypesByHash.insert(std::make_pair(TypeHash, Ty));
+ TypesByHash.insert(std::make_pair(NewTypeHash, Ty));
}
-
- // If there is no existing type of the same structure, we reinsert an
- // updated record into the map.
- Map.insert(std::make_pair(ValType::get(Ty), Ty));
-
+
// If the type is currently thought to be abstract, rescan all of our
- // subtypes to see if the type has just become concrete!
- if (Ty->isAbstract()) {
- Ty->setAbstract(Ty->isTypeAbstract());
-
- // If the type just became concrete, notify all users!
- if (!Ty->isAbstract())
- Ty->notifyUsesThatTypeBecameConcrete();
- }
+ // subtypes to see if the type has just become concrete! Note that this
+ // may send out notifications to AbstractTypeUsers that types become
+ // concrete.
+ if (Ty->isAbstract())
+ Ty->PromoteAbstractToConcrete();
}
-
+
void print(const char *Arg) const {
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "TypeMap<>::" << Arg << " table contents:\n";
+ DOUT << "TypeMap<>::" << Arg << " table contents:\n";
unsigned i = 0;
for (typename std::map<ValType, PATypeHolder>::const_iterator I
= Map.begin(), E = Map.end(); I != E; ++I)
- std::cerr << " " << (++i) << ". " << (void*)I->second.get() << " "
- << *I->second.get() << "\n";
+ DOUT << " " << (++i) << ". " << (void*)I->second.get() << " "
+ << *I->second.get() << "\n";
#endif
}
// 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;
+ std::vector<FunctionType::ParameterAttributes> ParamAttrs;
bool isVarArg;
public:
FunctionValType(const Type *ret, const std::vector<const Type*> &args,
- bool IVA) : RetTy(ret), isVarArg(IVA) {
+ 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]);
}
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;
+ return FT->getNumParams()*64+FT->getNumAttrs()*2+FT->isVarArg();
}
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;
+ return ArgTypes == MTV.ArgTypes && ParamAttrs < MTV.ParamAttrs;
}
};
}
// Define the actual map itself now...
-static TypeMap<FunctionValType, FunctionType> FunctionTypes;
+static ManagedStatic<TypeMap<FunctionValType, FunctionType> > FunctionTypes;
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));
- return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg());
+ for (unsigned i = 0, e = FT->getNumAttrs(); i != e; ++i)
+ ParamAttrs.push_back(FT->getParamAttrs(i));
+ return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg(),
+ ParamAttrs);
}
// FunctionType::get - The factory function for the FunctionType class...
-FunctionType *FunctionType::get(const Type *ReturnType,
+FunctionType *FunctionType::get(const Type *ReturnType,
const std::vector<const Type*> &Params,
- bool isVarArg) {
- FunctionValType VT(ReturnType, Params, isVarArg);
- FunctionType *MT = FunctionTypes.get(VT);
+ 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;
- FunctionTypes.add(VT, MT = new FunctionType(ReturnType, Params, isVarArg));
+ MT = new FunctionType(ReturnType, Params, isVarArg, *TheAttrs);
+ FunctionTypes->add(VT, MT);
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "Derived new type: " << MT << "\n";
+ DOUT << "Derived new type: " << MT << "\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 & NoUnwindAttribute)
+ Result += "nounwind ";
+ if (Attr & InRegAttribute)
+ Result += "inreg ";
+ if (Attr & StructRetAttribute)
+ Result += "sret ";
+ return Result;
+}
+
//===----------------------------------------------------------------------===//
// Array Type Factory...
//
namespace llvm {
class ArrayValType {
const Type *ValTy;
- unsigned Size;
+ uint64_t Size;
public:
- ArrayValType(const Type *val, int sz) : ValTy(val), Size(sz) {}
+ ArrayValType(const Type *val, uint64_t sz) : ValTy(val), Size(sz) {}
static ArrayValType get(const ArrayType *AT) {
return ArrayValType(AT->getElementType(), AT->getNumElements());
}
static unsigned hashTypeStructure(const ArrayType *AT) {
- return AT->getNumElements();
- }
-
- // Subclass should override this... to update self as usual
- void doRefinement(const DerivedType *OldType, const Type *NewType) {
- assert(ValTy == OldType);
- ValTy = NewType;
+ return (unsigned)AT->getNumElements();
}
inline bool operator<(const ArrayValType &MTV) const {
}
};
}
-static TypeMap<ArrayValType, ArrayType> ArrayTypes;
+static ManagedStatic<TypeMap<ArrayValType, ArrayType> > ArrayTypes;
-ArrayType *ArrayType::get(const Type *ElementType, unsigned NumElements) {
+ArrayType *ArrayType::get(const Type *ElementType, uint64_t NumElements) {
assert(ElementType && "Can't get array of null types!");
ArrayValType AVT(ElementType, NumElements);
- ArrayType *AT = ArrayTypes.get(AVT);
+ ArrayType *AT = ArrayTypes->get(AVT);
if (AT) return AT; // Found a match, return it!
// Value not found. Derive a new type!
- ArrayTypes.add(AVT, AT = new ArrayType(ElementType, NumElements));
+ ArrayTypes->add(AVT, AT = new ArrayType(ElementType, NumElements));
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "Derived new type: " << *AT << "\n";
+ DOUT << "Derived new type: " << *AT << "\n";
#endif
return AT;
}
//===----------------------------------------------------------------------===//
-// 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 TypeMap<PackedValType, PackedType> PackedTypes;
+static ManagedStatic<TypeMap<VectorValType, VectorType> > VectorTypes;
-PackedType *PackedType::get(const Type *ElementType, unsigned NumElements) {
+VectorType *VectorType::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!");
- 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
- std::cerr << "Derived new type: " << *PT << "\n";
+ DOUT << "Derived new type: " << *PT << "\n";
#endif
return PT;
}
//
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;
ElTypes.reserve(ST->getNumElements());
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 TypeMap<StructValType, StructType> StructTypes;
+static ManagedStatic<TypeMap<StructValType, StructType> > StructTypes;
-StructType *StructType::get(const std::vector<const Type*> &ETypes) {
- StructValType STV(ETypes);
- StructType *ST = StructTypes.get(STV);
+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));
+ StructTypes->add(STV, ST = new StructType(ETypes, isPacked));
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "Derived new type: " << *ST << "\n";
+ DOUT << "Derived new type: " << *ST << "\n";
#endif
return ST;
}
}
static unsigned hashTypeStructure(const PointerType *PT) {
- return 0;
- }
-
- // Subclass should override this... to update self as usual
- void doRefinement(const DerivedType *OldType, const Type *NewType) {
- assert(ValTy == OldType);
- ValTy = NewType;
+ return getSubElementHash(PT);
}
bool operator<(const PointerValType &MTV) const {
};
}
-static TypeMap<PointerValType, PointerType> PointerTypes;
+static ManagedStatic<TypeMap<PointerValType, PointerType> > PointerTypes;
PointerType *PointerType::get(const Type *ValueType) {
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);
- PointerType *PT = PointerTypes.get(PVT);
+ 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));
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "Derived new type: " << *PT << "\n";
+ DOUT << "Derived new type: " << *PT << "\n";
#endif
return PT;
}
-
//===----------------------------------------------------------------------===//
// Derived Type Refinement Functions
//===----------------------------------------------------------------------===//
// the PATypeHandle class. When there are no users of the abstract type, it
// is annihilated, because there is no way to get a reference to it ever again.
//
-void DerivedType::removeAbstractTypeUser(AbstractTypeUser *U) const {
+void Type::removeAbstractTypeUser(AbstractTypeUser *U) const {
// Search from back to front because we will notify users from back to
// front. Also, it is likely that there will be a stack like behavior to
// users that register and unregister users.
assert(i < AbstractTypeUsers.size() && "Index out of range!"); // Wraparound?
AbstractTypeUsers.erase(AbstractTypeUsers.begin()+i);
-
+
#ifdef DEBUG_MERGE_TYPES
- std::cerr << " remAbstractTypeUser[" << (void*)this << ", "
- << *this << "][" << i << "] User = " << U << "\n";
+ DOUT << " remAbstractTypeUser[" << (void*)this << ", "
+ << *this << "][" << i << "] User = " << U << "\n";
#endif
-
+
if (AbstractTypeUsers.empty() && getRefCount() == 0 && isAbstract()) {
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "DELETEing unused abstract type: <" << *this
- << ">[" << (void*)this << "]" << "\n";
+ DOUT << "DELETEing unused abstract type: <" << *this
+ << ">[" << (void*)this << "]" << "\n";
#endif
delete this; // No users of this abstract type!
}
}
-// refineAbstractTypeTo - This function is used to when it is discovered that
+// 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
// NewType and for 'this' to be deleted.
assert(ForwardType == 0 && "This type has already been refined!");
// The descriptions may be out of date. Conservatively clear them all!
- AbstractTypeDescriptions.clear();
+ AbstractTypeDescriptions->clear();
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "REFINING abstract type [" << (void*)this << " "
- << *this << "] to [" << (void*)NewType << " "
- << *NewType << "]!\n";
+ DOUT << "REFINING abstract type [" << (void*)this << " "
+ << *this << "] to [" << (void*)NewType << " "
+ << *NewType << "]!\n";
#endif
// Make sure to put the type to be refined to into a holder so that if IT gets
unsigned OldSize = AbstractTypeUsers.size();
#ifdef DEBUG_MERGE_TYPES
- std::cerr << " REFINING user " << OldSize-1 << "[" << (void*)User
- << "] of abstract type [" << (void*)this << " "
- << *this << "] to [" << (void*)NewTy.get() << " "
- << *NewTy << "]!\n";
+ DOUT << " REFINING user " << OldSize-1 << "[" << (void*)User
+ << "] of abstract type [" << (void*)this << " "
+ << *this << "] to [" << (void*)NewTy.get() << " "
+ << *NewTy << "]!\n";
#endif
User->refineAbstractType(this, NewTy);
//
void DerivedType::notifyUsesThatTypeBecameConcrete() {
#ifdef DEBUG_MERGE_TYPES
- std::cerr << "typeIsREFINED type: " << (void*)this << " " << *this << "\n";
+ DOUT << "typeIsREFINED type: " << (void*)this << " " << *this << "\n";
#endif
unsigned OldSize = AbstractTypeUsers.size();
"AbstractTypeUser did not remove itself from the use list!");
}
}
-
-
-
// refineAbstractType - Called when a contained type is found to be more
// concrete - this could potentially change us from an abstract type to a
//
void FunctionType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- FunctionTypes.finishRefinement(this, OldType, NewType);
+ FunctionTypes->RefineAbstractType(this, OldType, NewType);
}
void FunctionType::typeBecameConcrete(const DerivedType *AbsTy) {
- refineAbstractType(AbsTy, AbsTy);
+ FunctionTypes->TypeBecameConcrete(this, AbsTy);
}
//
void ArrayType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- ArrayTypes.finishRefinement(this, OldType, NewType);
+ ArrayTypes->RefineAbstractType(this, OldType, NewType);
}
void ArrayType::typeBecameConcrete(const DerivedType *AbsTy) {
- refineAbstractType(AbsTy, AbsTy);
+ ArrayTypes->TypeBecameConcrete(this, AbsTy);
}
// refineAbstractType - Called when a contained type is found to be more
// 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.finishRefinement(this, OldType, NewType);
+ VectorTypes->RefineAbstractType(this, OldType, NewType);
}
-void PackedType::typeBecameConcrete(const DerivedType *AbsTy) {
- refineAbstractType(AbsTy, AbsTy);
+void VectorType::typeBecameConcrete(const DerivedType *AbsTy) {
+ VectorTypes->TypeBecameConcrete(this, AbsTy);
}
// refineAbstractType - Called when a contained type is found to be more
//
void StructType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- StructTypes.finishRefinement(this, OldType, NewType);
+ StructTypes->RefineAbstractType(this, OldType, NewType);
}
void StructType::typeBecameConcrete(const DerivedType *AbsTy) {
- refineAbstractType(AbsTy, AbsTy);
+ StructTypes->TypeBecameConcrete(this, AbsTy);
}
// refineAbstractType - Called when a contained type is found to be more
//
void PointerType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- PointerTypes.finishRefinement(this, OldType, NewType);
+ PointerTypes->RefineAbstractType(this, OldType, NewType);
}
void PointerType::typeBecameConcrete(const DerivedType *AbsTy) {
- refineAbstractType(AbsTy, AbsTy);
+ PointerTypes->TypeBecameConcrete(this, AbsTy);
}
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 {
return OS;
}
}
-
-// vim: sw=2