//===-- 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/DerivedTypes.h"
#include "llvm/SymbolTable.h"
#include "llvm/Constants.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/StringExtras.h"
-#include "Support/STLExtras.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 <algorithm>
#include <iostream>
using namespace llvm;
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;
+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;
}
+
const Type *Type::getPrimitiveType(TypeID IDNumber) {
switch (IDNumber) {
case VoidTyID : return VoidTy;
switch (getTypeID()) {
default:
assert(isInteger()&&"Type::getUnsignedVersion is only valid for integers!");
- case Type::UByteTyID:
+ case Type::UByteTyID:
case Type::SByteTyID: return Type::UByteTy;
- case Type::UShortTyID:
+ case Type::UShortTyID:
case Type::ShortTyID: return Type::UShortTy;
- case Type::UIntTyID:
+ case Type::UIntTyID:
case Type::IntTyID: return Type::UIntTy;
- case Type::ULongTyID:
+ case Type::ULongTyID:
case Type::LongTyID: return Type::ULongTy;
}
}
switch (getTypeID()) {
default:
assert(isInteger() && "Type::getSignedVersion is only valid for integers!");
- case Type::UByteTyID:
+ case Type::UByteTyID:
case Type::SByteTyID: return Type::SByteTy;
- case Type::UShortTyID:
+ case Type::UShortTyID:
case Type::ShortTyID: return Type::ShortTy;
- case Type::UIntTyID:
+ case Type::UIntTyID:
case Type::IntTyID: return Type::IntTy;
- case Type::ULongTyID:
+ case Type::ULongTyID:
case Type::LongTyID: return Type::LongTy;
}
}
//
unsigned Type::getPrimitiveSize() const {
switch (getTypeID()) {
-#define HANDLE_PRIM_TYPE(TY,SIZE) case TY##TyID: return SIZE;
-#include "llvm/Type.def"
+ 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;
+ }
+}
+
+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::DoubleTyID: return 64;
default: return 0;
}
}
if (const ArrayType *ATy = dyn_cast<ArrayType>(this))
return ATy->getElementType()->isSized();
+ if (const PackedType *PTy = dyn_cast<PackedType>(this))
+ return PTy->getElementType()->isSized();
+
if (!isa<StructType>(this)) return false;
// Okay, our struct is sized if all of the elements are...
/// 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.
//
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;
}
-
+
// 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::FunctionTyID: {
const FunctionType *FTy = cast<FunctionType>(Ty);
Result += getTypeDescription(ATy->getElementType(), TypeStack) + "]";
break;
}
+ case Type::PackedTyID: {
+ const PackedType *PTy = cast<PackedType>(Ty);
+ unsigned NumElements = PTy->getNumElements();
+ Result = "<";
+ Result += utostr(NumElements) + " x ";
+ Result += getTypeDescription(PTy->getElementType(), TypeStack) + ">";
+ break;
+ }
default:
Result = "<error>";
assert(0 && "Unhandled type in getTypeDescription!");
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;
}
//===----------------------------------------------------------------------===//
FunctionType::FunctionType(const Type *Result,
- const std::vector<const Type*> &Params,
- bool IsVarArgs) : DerivedType(FunctionTyID),
+ const std::vector<const Type*> &Params,
+ bool IsVarArgs) : 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);
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) {
+ NumElements = NumEl;
+
+ 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");
+}
+
+
PointerType::PointerType(const Type *E) : SequentialType(PointerTyID, E) {
// Calculate whether or not this type is abstract
setAbstract(E->isAbstract());
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();
}
}
-// 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();
+ }
+ }
+ }
}
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);
+ 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() ||
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;
}
// 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);
+ while (I->second != Ty) {
+ ++I;
+ assert(I != TypesByHash.end() && I->first == Hash);
+ }
+ TypesByHash.erase(I);
+ }
+
+ /// 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);
+
+ 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();
}
- /// 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";
+ std::cerr << "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) {
+ assert(OldType != NewType);
+ // 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(OldTypeHash);
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.
+ // 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;
}
-
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";
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() << " "
+ std::cerr << " " << (++i) << ". " << (void*)I->second.get() << " "
<< *I->second.get() << "\n";
#endif
}
// 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);
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();
+ return (unsigned)AT->getNumElements();
}
// Subclass should override this... to update self as usual
static 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);
return AT;
}
+
+//===----------------------------------------------------------------------===//
+// Packed Type Factory...
+//
+namespace llvm {
+class PackedValType {
+ const Type *ValTy;
+ unsigned Size;
+public:
+ PackedValType(const Type *val, int sz) : ValTy(val), Size(sz) {}
+
+ static PackedValType get(const PackedType *PT) {
+ return PackedValType(PT->getElementType(), PT->getNumElements());
+ }
+
+ static unsigned hashTypeStructure(const PackedType *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 {
+ if (Size < MTV.Size) return true;
+ return Size == MTV.Size && ValTy < MTV.ValTy;
+ }
+};
+}
+static TypeMap<PackedValType, PackedType> PackedTypes;
+
+
+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!");
+
+ PackedValType PVT(ElementType, NumElements);
+ PackedType *PT = PackedTypes.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));
+
+#ifdef DEBUG_MERGE_TYPES
+ std::cerr << "Derived new type: " << *PT << "\n";
+#endif
+ return PT;
+}
+
//===----------------------------------------------------------------------===//
// Struct Type Factory...
//
ElTypes.reserve(ST->getNumElements());
for (unsigned i = 0, e = ST->getNumElements(); i != e; ++i)
ElTypes.push_back(ST->getElementType(i));
-
+
return StructValType(ElTypes);
}
PointerType *PointerType::get(const Type *ValueType) {
assert(ValueType && "Can't get a pointer to <null> type!");
+ // FIXME: The sparc backend makes void pointers, which is horribly broken.
+ // "Fix" it, then reenable this assertion.
+ //assert(ValueType != Type::VoidTy &&
+ // "Pointer to void is not valid, use sbyte* instead!");
PointerValType PVT(ValueType);
PointerType *PT = PointerTypes.get(PVT);
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";
#endif
-
+
if (AbstractTypeUsers.empty() && getRefCount() == 0 && isAbstract()) {
#ifdef DEBUG_MERGE_TYPES
std::cerr << "DELETEing unused abstract type: <" << *this
"AbstractTypeUser did not remove itself from the use list!");
}
}
-
+
//
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,
+ const Type *NewType) {
+ PackedTypes.RefineAbstractType(this, OldType, NewType);
+}
+
+void PackedType::typeBecameConcrete(const DerivedType *AbsTy) {
+ PackedTypes.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
//
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 {
}
}
+/// clearAllTypeMaps - This method frees all internal memory used by the
+/// type subsystem, which can be used in environments where this memory is
+/// otherwise reported as a leak.
+void Type::clearAllTypeMaps() {
+ std::vector<Type *> DerivedTypes;
+
+ FunctionTypes.clear(DerivedTypes);
+ PointerTypes.clear(DerivedTypes);
+ StructTypes.clear(DerivedTypes);
+ ArrayTypes.clear(DerivedTypes);
+ PackedTypes.clear(DerivedTypes);
+
+ for(std::vector<Type *>::iterator I = DerivedTypes.begin(),
+ E = DerivedTypes.end(); I != E; ++I)
+ (*I)->ContainedTys.clear();
+ for(std::vector<Type *>::iterator I = DerivedTypes.begin(),
+ E = DerivedTypes.end(); I != E; ++I)
+ delete *I;
+ DerivedTypes.clear();
+}
+
// vim: sw=2
projects / oota-llvm.git / blobdiff