#include "Support/StringExtras.h"
#include "Support/STLExtras.h"
#include <algorithm>
-
using namespace llvm;
// DEBUG_MERGE_TYPES - Enable this #define to see how and when derived types are
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,
+ 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);
+
+ for (Type::subtype_iterator I = CurTy->subtype_begin(),
+ E = CurTy->subtype_end(); I != E; ++I)
+ if (TypeHasCycleThrough(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;
+ return false;
+}
//===----------------------------------------------------------------------===//
// 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...
+// our map if an abstract type gets refined somehow.
//
namespace llvm {
template<class ValType, class TypeClass>
class TypeMap {
- typedef std::map<ValType, PATypeHolder> MapTy;
- MapTy Map;
+ std::map<ValType, PATypeHolder> Map;
+
+ /// TypesByHash - Keep track of each type by its structure hash value.
+ ///
+ std::multimap<unsigned, PATypeHolder> TypesByHash;
public:
- typedef typename MapTy::iterator iterator;
+ typedef typename std::map<ValType, PATypeHolder>::iterator iterator;
~TypeMap() { print("ON EXIT"); }
inline TypeClass *get(const ValType &V) {
return I != Map.end() ? cast<TypeClass>((Type*)I->second.get()) : 0;
}
- inline void add(const ValType &V, TypeClass *T) {
- Map.insert(std::make_pair(V, T));
+ inline void add(const ValType &V, TypeClass *Ty) {
+ Map.insert(std::make_pair(V, Ty));
+
+ // If this type has a cycle, remember it.
+ TypesByHash.insert(std::make_pair(ValType::hashTypeStructure(Ty), Ty));
print("add");
}
- iterator getEntryForType(TypeClass *Ty) {
- iterator I = Map.find(ValType::get(Ty));
- if (I == Map.end()) print("ERROR!");
- assert(I != Map.end() && "Didn't find type entry!");
- assert(I->second.get() == (const Type*)Ty && "Type entry wrong?");
- return I;
+ 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
/// 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(iterator TyIt) {
+ void finishRefinement(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";
+#endif
+
// Make a temporary type holder for the type so that it doesn't disappear on
// us when we erase the entry from the map.
- PATypeHolder TyHolder = TyIt->second;
- TypeClass *Ty = cast<TypeClass>((Type*)TyHolder.get());
+ PATypeHolder TyHolder = Ty;
// 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(TyIt);
-
- // Determine whether there is a cycle through the type graph which passes
- // back through this type. Other cycles are ok though.
- bool HasTypeCycle = false;
- {
- std::set<const Type*> VisitedTypes;
- for (Type::subtype_iterator I = Ty->subtype_begin(),
- E = Ty->subtype_end(); I != E; ++I) {
- for (df_ext_iterator<const Type *, std::set<const Type*> >
- DFI = df_ext_begin(I->get(), VisitedTypes),
- E = df_ext_end(I->get(), VisitedTypes); DFI != E; ++DFI)
- if (*DFI == Ty) {
- HasTypeCycle = true;
- goto FoundCycle;
- }
+ Map.erase(ValType::get(Ty));
+
+ // 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.
+ 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();
+ Ty->ContainedTys[i] = NewType;
}
- }
- FoundCycle:
-
- ValType Key = ValType::get(Ty);
+ unsigned TypeHash = 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.
- if (!HasTypeCycle) {
- iterator I = Map.find(Key);
+ bool TypeHasCycle = Ty->isAbstract() && TypeHasCycleThroughItself(Ty);
+ if (!TypeHasCycle) {
+ iterator I = Map.find(ValType::get(Ty));
if (I != Map.end()) {
// We already have this type in the table. Get rid of the newly refined
// type.
TypeClass *NewTy = cast<TypeClass>((Type*)I->second.get());
// Refined to a different type altogether?
+ RemoveFromTypesByHash(TypeHash, Ty);
Ty->refineAbstractTypeTo(NewTy);
return;
}
// structurally identical to the newly refined type. If so, this type
// gets refined to the pre-existing type.
//
- for (iterator I = Map.begin(), E = Map.end(); I != E; ++I)
- if (TypesEqual(Ty, I->second)) {
- assert(Ty->isAbstract() && "Replacing a non-abstract type?");
- TypeClass *NewTy = cast<TypeClass>((Type*)I->second.get());
-
- // Refined to a different type altogether?
- Ty->refineAbstractTypeTo(NewTy);
- return;
+ std::multimap<unsigned, PATypeHolder>::iterator I,E, Entry;
+ tie(I, E) = TypesByHash.equal_range(TypeHash);
+ Entry = E;
+ for (; I != E; ++I) {
+ if (I->second != Ty) {
+ 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??");
+ }
+ Entry = I;
+ }
+
+ TypesByHash.erase(Entry);
+ Ty->refineAbstractTypeTo(NewTy);
+ return;
+ }
+ } else {
+ // Remember the position of
+ Entry = I;
}
+ }
+ }
+
+ // 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) {
+ RemoveFromTypesByHash(OldTypeHash, Ty);
+ TypesByHash.insert(std::make_pair(TypeHash, Ty));
}
// If there is no existing type of the same structure, we reinsert an
// updated record into the map.
- Map.insert(std::make_pair(Key, Ty));
+ 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!
}
}
- void remove(const ValType &OldVal) {
- iterator I = Map.find(OldVal);
- assert(I != Map.end() && "TypeMap::remove, element not found!");
- Map.erase(I);
- }
-
- void remove(iterator I) {
- assert(I != Map.end() && "Cannot remove invalid iterator pointer!");
- Map.erase(I);
- }
-
void print(const char *Arg) const {
#ifdef DEBUG_MERGE_TYPES
std::cerr << "TypeMap<>::" << Arg << " table contents:\n";
unsigned i = 0;
- for (typename MapTy::const_iterator I = Map.begin(), E = Map.end();
- I != E; ++I)
+ 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";
#endif
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;
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);
return StructValType(ElTypes);
}
+ 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)
return PointerValType(PT->getElementType());
}
+ 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);
return PT;
}
-namespace llvm {
-void debug_type_tables() {
- FunctionTypes.dump();
- ArrayTypes.dump();
- StructTypes.dump();
- PointerTypes.dump();
-}
-}
//===----------------------------------------------------------------------===//
// Derived Type Refinement Functions
//
void FunctionType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- assert((isAbstract() || !OldType->isAbstract()) &&
- "Refining a non-abstract type!");
-#ifdef DEBUG_MERGE_TYPES
- std::cerr << "FunctionTy::refineAbstractTy(" << (void*)OldType << "["
- << *OldType << "], " << (void*)NewType << " ["
- << *NewType << "])\n";
-#endif
-
- // Look up our current type map entry..
- TypeMap<FunctionValType, FunctionType>::iterator TMI =
- FunctionTypes.getEntryForType(this);
-
- // Find the type element we are refining...
- for (unsigned i = 0, e = ContainedTys.size(); i != e; ++i)
- if (ContainedTys[i] == OldType) {
- ContainedTys[i].removeUserFromConcrete();
- ContainedTys[i] = NewType;
- }
-
- FunctionTypes.finishRefinement(TMI);
+ FunctionTypes.finishRefinement(this, OldType, NewType);
}
void FunctionType::typeBecameConcrete(const DerivedType *AbsTy) {
//
void ArrayType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- assert((isAbstract() || !OldType->isAbstract()) &&
- "Refining a non-abstract type!");
-#ifdef DEBUG_MERGE_TYPES
- std::cerr << "ArrayTy::refineAbstractTy(" << (void*)OldType << "["
- << *OldType << "], " << (void*)NewType << " ["
- << *NewType << "])\n";
-#endif
-
- // Look up our current type map entry..
- TypeMap<ArrayValType, ArrayType>::iterator TMI =
- ArrayTypes.getEntryForType(this);
-
- assert(getElementType() == OldType);
- ContainedTys[0].removeUserFromConcrete();
- ContainedTys[0] = NewType;
-
- ArrayTypes.finishRefinement(TMI);
+ ArrayTypes.finishRefinement(this, OldType, NewType);
}
void ArrayType::typeBecameConcrete(const DerivedType *AbsTy) {
//
void StructType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- assert((isAbstract() || !OldType->isAbstract()) &&
- "Refining a non-abstract type!");
-#ifdef DEBUG_MERGE_TYPES
- std::cerr << "StructTy::refineAbstractTy(" << (void*)OldType << "["
- << *OldType << "], " << (void*)NewType << " ["
- << *NewType << "])\n";
-#endif
-
- // Look up our current type map entry..
- TypeMap<StructValType, StructType>::iterator TMI =
- StructTypes.getEntryForType(this);
-
- for (int i = ContainedTys.size()-1; i >= 0; --i)
- if (ContainedTys[i] == OldType) {
- ContainedTys[i].removeUserFromConcrete();
-
- // Update old type to new type in the array...
- ContainedTys[i] = NewType;
- }
-
- StructTypes.finishRefinement(TMI);
+ StructTypes.finishRefinement(this, OldType, NewType);
}
void StructType::typeBecameConcrete(const DerivedType *AbsTy) {
//
void PointerType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
- assert((isAbstract() || !OldType->isAbstract()) &&
- "Refining a non-abstract type!");
-#ifdef DEBUG_MERGE_TYPES
- std::cerr << "PointerTy::refineAbstractTy(" << (void*)OldType << "["
- << *OldType << "], " << (void*)NewType << " ["
- << *NewType << "])\n";
-#endif
-
- // Look up our current type map entry..
- TypeMap<PointerValType, PointerType>::iterator TMI =
- PointerTypes.getEntryForType(this);
-
- assert(ContainedTys[0] == OldType);
- ContainedTys[0].removeUserFromConcrete();
- ContainedTys[0] = NewType;
-
- PointerTypes.finishRefinement(TMI);
+ PointerTypes.finishRefinement(this, OldType, NewType);
}
void PointerType::typeBecameConcrete(const DerivedType *AbsTy) {
projects / oota-llvm.git / blobdiff