//===-- 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 <algorithm>
+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 cannonical version of a type.
+// a single canonical version of a type.
//
//#define DEBUG_MERGE_TYPES 1
static std::map<const Type*, std::string> ConcreteTypeDescriptions;
static std::map<const Type*, std::string> AbstractTypeDescriptions;
-void PATypeHolder::dump() const {
- std::cerr << "PATypeHolder(" << (void*)this << ")\n";
-}
-
-
Type::Type(const std::string &name, PrimitiveID id)
- : Value(Type::TypeTy, Value::TypeVal) {
+ : Value(Type::TypeTy, Value::TypeVal), ForwardType(0) {
if (!name.empty())
ConcreteTypeDescriptions[this] = name;
ID = id;
case Type::ShortTyID: return Ty == Type::UShortTy;
case Type::UIntTyID: return Ty == Type::IntTy;
case Type::IntTyID: return Ty == Type::UIntTy;
- case Type::ULongTyID:
- case Type::LongTyID:
- case Type::PointerTyID:
- return Ty == Type::ULongTy || Ty == Type::LongTy || isa<PointerType>(Ty);
+ 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
}
}
-// getPrimitiveSize - Return the basic size of this type if it is a primative
+// 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.
//
}
+/// getForwardedTypeInternal - This method is used to implement the union-find
+/// 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();
+ if (!RealForwardedType)
+ return ForwardType; // No it's not forwarded again
+
+ // Yes, it is forwarded again. First thing, add the reference to the new
+ // forward type.
+ if (RealForwardedType->isAbstract())
+ cast<DerivedType>(RealForwardedType)->addRef();
+
+ // Now drop the old reference. This could cause ForwardType to get deleted.
+ cast<DerivedType>(ForwardType)->dropRef();
+
+ // Return the updated type.
+ ForwardType = RealForwardedType;
+ return ForwardType;
+}
+
// getTypeDescription - This is a recursive function that walks a type hierarchy
// calculating the description for a type.
//
case Type::FunctionTyID: {
const FunctionType *FTy = cast<FunctionType>(Ty);
Result = getTypeDescription(FTy->getReturnType(), TypeStack) + " (";
- for (FunctionType::ParamTypes::const_iterator
- I = FTy->getParamTypes().begin(),
- E = FTy->getParamTypes().end(); I != E; ++I) {
- if (I != FTy->getParamTypes().begin())
+ for (FunctionType::param_iterator I = FTy->param_begin(),
+ E = FTy->param_end(); I != E; ++I) {
+ if (I != FTy->param_begin())
Result += ", ";
Result += getTypeDescription(*I, TypeStack);
}
if (FTy->isVarArg()) {
- if (!FTy->getParamTypes().empty()) Result += ", ";
+ if (FTy->getNumParams()) Result += ", ";
Result += "...";
}
Result += ")";
case Type::StructTyID: {
const StructType *STy = cast<StructType>(Ty);
Result = "{ ";
- for (StructType::ElementTypes::const_iterator
- I = STy->getElementTypes().begin(),
- E = STy->getElementTypes().end(); I != E; ++I) {
- if (I != STy->getElementTypes().begin())
+ for (StructType::element_iterator I = STy->element_begin(),
+ E = STy->element_end(); I != E; ++I) {
+ if (I != STy->element_begin())
Result += ", ";
Result += getTypeDescription(*I, TypeStack);
}
bool StructType::indexValid(const Value *V) const {
- if (!isa<Constant>(V)) return false;
- if (V->getType() != Type::UByteTy) return false;
- unsigned Idx = cast<ConstantUInt>(V)->getValue();
- return Idx < ETypes.size();
+ // Structure indexes require unsigned integer constants.
+ if (const ConstantUInt *CU = dyn_cast<ConstantUInt>(V))
+ return CU->getValue() < ContainedTys.size();
+ return false;
}
// getTypeAtIndex - Given an index value into the type, return the type of the
//
const Type *StructType::getTypeAtIndex(const Value *V) const {
assert(isa<Constant>(V) && "Structure index must be a constant!!");
- assert(V->getType() == Type::UByteTy && "Structure index must be ubyte!");
unsigned Idx = cast<ConstantUInt>(V)->getValue();
- assert(Idx < ETypes.size() && "Structure index out of range!");
+ assert(Idx < ContainedTys.size() && "Structure index out of range!");
assert(indexValid(V) && "Invalid structure index!"); // Duplicate check
-
- return ETypes[Idx];
+ return ContainedTys[Idx];
}
//===----------------------------------------------------------------------===//
-// Auxilliary classes
+// Auxiliary classes
//===----------------------------------------------------------------------===//
//
// These classes are used to implement specialized behavior for each different
FunctionType::FunctionType(const Type *Result,
const std::vector<const Type*> &Params,
bool IsVarArgs) : DerivedType(FunctionTyID),
- ResultType(PATypeHandle(Result, this)),
- isVarArgs(IsVarArgs) {
+ isVarArgs(IsVarArgs) {
bool isAbstract = Result->isAbstract();
- ParamTys.reserve(Params.size());
- for (unsigned i = 0; i < Params.size(); ++i) {
- ParamTys.push_back(PATypeHandle(Params[i], this));
+ ContainedTys.reserve(Params.size()+1);
+ ContainedTys.push_back(PATypeHandle(Result, this));
+
+ for (unsigned i = 0; i != Params.size(); ++i) {
+ ContainedTys.push_back(PATypeHandle(Params[i], this));
isAbstract |= Params[i]->isAbstract();
}
StructType::StructType(const std::vector<const Type*> &Types)
: CompositeType(StructTyID) {
- ETypes.reserve(Types.size());
+ ContainedTys.reserve(Types.size());
bool isAbstract = false;
for (unsigned i = 0; i < Types.size(); ++i) {
assert(Types[i] != Type::VoidTy && "Void type in method prototype!!");
- ETypes.push_back(PATypeHandle(Types[i], this));
+ ContainedTys.push_back(PATypeHandle(Types[i], this));
isAbstract |= Types[i]->isAbstract();
}
#endif
}
+// dropAllTypeUses - When this (abstract) type is resolved to be equal to
+// another (more concrete) type, we must eliminate all references to other
+// 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;
+ }
+}
// 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
// one!
for (Type::subtype_iterator I = subtype_begin(), E = subtype_end();
I != E; ++I)
- if (const_cast<Type*>(*I)->isTypeAbstract()) {
+ if (const_cast<Type*>(I->get())->isTypeAbstract()) {
setAbstract(true); // Restore the abstract bit.
return true; // This type is abstract if subtype is abstract!
}
std::map<const Type *, const Type *> &EqTypes) {
if (Ty == Ty2) return true;
if (Ty->getPrimitiveID() != Ty2->getPrimitiveID()) return false;
- if (Ty->isPrimitiveType()) return true;
if (isa<OpaqueType>(Ty))
- return false; // Two nonequal opaque types are never equal
+ return false; // Two unequal opaque types are never equal
- std::map<const Type*, const Type*>::iterator It = EqTypes.find(Ty);
- if (It != EqTypes.end())
+ std::map<const Type*, const Type*>::iterator It = EqTypes.lower_bound(Ty);
+ if (It != EqTypes.end() && It->first == Ty)
return It->second == Ty2; // Looping back on a type, check for equality
// Otherwise, add the mapping to the table to make sure we don't get
// recursion on the types...
- EqTypes.insert(std::make_pair(Ty, Ty2));
-
- // Iterate over the types and make sure the the contents are equivalent...
- Type::subtype_iterator I = Ty ->subtype_begin(), IE = Ty ->subtype_end();
- Type::subtype_iterator I2 = Ty2->subtype_begin(), IE2 = Ty2->subtype_end();
- for (; I != IE && I2 != IE2; ++I, ++I2)
- if (!TypesEqual(*I, *I2, EqTypes)) return false;
+ EqTypes.insert(It, std::make_pair(Ty, Ty2));
// Two really annoying special cases that breaks an otherwise nice simple
// 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 ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
- if (ATy->getNumElements() != cast<ArrayType>(Ty2)->getNumElements())
- return false;
+ //
+ 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;
+ for (unsigned i = 0, e = STy2->getNumElements(); i != e; ++i)
+ if (!TypesEqual(STy->getElementType(i), STy2->getElementType(i), EqTypes))
+ return false;
+ return true;
+ } else if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
+ const ArrayType *ATy2 = cast<ArrayType>(Ty2);
+ return ATy->getNumElements() == ATy2->getNumElements() &&
+ TypesEqual(ATy->getElementType(), ATy2->getElementType(), EqTypes);
} else if (const FunctionType *FTy = dyn_cast<FunctionType>(Ty)) {
- if (FTy->isVarArg() != cast<FunctionType>(Ty2)->isVarArg())
+ const FunctionType *FTy2 = cast<FunctionType>(Ty2);
+ if (FTy->isVarArg() != FTy2->isVarArg() ||
+ FTy->getNumParams() != FTy2->getNumParams() ||
+ !TypesEqual(FTy->getReturnType(), FTy2->getReturnType(), EqTypes))
return false;
+ for (unsigned i = 0, e = FTy2->getNumParams(); i != e; ++i)
+ if (!TypesEqual(FTy->getParamType(i), FTy2->getParamType(i), EqTypes))
+ return false;
+ return true;
+ } else {
+ assert(0 && "Unknown derived type!");
+ return false;
}
-
- return I == IE && I2 == IE2; // Types equal if both iterators are done
}
static bool TypesEqual(const Type *Ty, const Type *Ty2) {
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 : public AbstractTypeUser {
- typedef std::map<ValType, PATypeHandle> MapTy;
- MapTy Map;
+class TypeMap {
+ 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) {
iterator I = Map.find(V);
- return I != Map.end() ? (TypeClass*)I->second.get() : 0;
+ 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, PATypeHandle(T, this)));
+ 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(T->second == 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(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
- void finishRefinement(TypeClass *Ty) {
- //const TypeClass *Ty = (const TypeClass*)TyIt->second.get();
- for (iterator I = Map.begin(), E = Map.end(); I != E; ++I)
- if (I->second.get() != Ty && TypesEqual(Ty, I->second.get())) {
+ // 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 = 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(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;
+ }
+
+ 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.
+ 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.
assert(Ty->isAbstract() && "Replacing a non-abstract type?");
- TypeClass *NewTy = (TypeClass*)I->second.get();
-#if 0
- //Map.erase(TyIt); // The old entry is now dead!
-#endif
+ TypeClass *NewTy = cast<TypeClass>((Type*)I->second.get());
+
// Refined to a different type altogether?
- Ty->refineAbstractTypeToInternal(NewTy, false);
+ 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);
+ 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(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())
+ if (Ty->isAbstract()) {
Ty->setAbstract(Ty->isTypeAbstract());
- // This method may be called with either an abstract or a concrete type.
- // Concrete types might get refined if a subelement type got refined which
- // was previously marked as abstract, but was realized to be concrete. This
- // can happen for recursive types.
- Ty->typeIsRefined(); // Same type, different contents...
- }
-
- // refineAbstractType - This is called when one of the contained abstract
- // types gets refined... this simply removes the abstract type from our table.
- // We expect that whoever refined the type will add it back to the table,
- // corrected.
- //
- virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
-#ifdef DEBUG_MERGE_TYPES
- std::cerr << "Removing Old type from Tab: " << (void*)OldTy << ", "
- << *OldTy << " replacement == " << (void*)NewTy
- << ", " << *NewTy << "\n";
-#endif
- for (iterator I = Map.begin(), E = Map.end(); I != E; ++I)
- if (I->second.get() == OldTy) {
- // Check to see if the type just became concrete. If so, remove self
- // from user list.
- I->second.removeUserFromConcrete();
- I->second = cast<TypeClass>(NewTy);
- }
- }
-
- 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);
+ // If the type just became concrete, notify all users!
+ if (!Ty->isAbstract())
+ Ty->notifyUsesThatTypeBecameConcrete();
+ }
}
-
+
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
void dump() const { print("dump output"); }
};
-
-
-// ValTypeBase - This is the base class that is used by the various
-// instantiations of TypeMap. This class is an AbstractType user that notifies
-// the underlying TypeMap when it gets modified.
-//
-template<class ValType, class TypeClass>
-class ValTypeBase : public AbstractTypeUser {
- TypeMap<ValType, TypeClass> &MyTable;
-protected:
- inline ValTypeBase(TypeMap<ValType, TypeClass> &tab) : MyTable(tab) {}
-
- // Subclass should override this... to update self as usual
- virtual void doRefinement(const DerivedType *OldTy, const Type *NewTy) = 0;
-
- // typeBecameConcrete - This callback occurs when a contained type refines
- // to itself, but becomes concrete in the process. Our subclass should remove
- // itself from the ATU list of the specified type.
- //
- virtual void typeBecameConcrete(const DerivedType *Ty) = 0;
-
- virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
- assert(OldTy == NewTy || OldTy->isAbstract());
-
- if (!OldTy->isAbstract())
- typeBecameConcrete(OldTy);
-
- TypeMap<ValType, TypeClass> &Table = MyTable; // Copy MyTable reference
- ValType Tmp(*(ValType*)this); // Copy this.
- PATypeHandle OldType(Table.get(*(ValType*)this), this);
- Table.remove(*(ValType*)this); // Destroy's this!
-
- // Refine temporary to new state...
- if (OldTy != NewTy)
- Tmp.doRefinement(OldTy, NewTy);
-
- // FIXME: when types are not const!
- Table.add((ValType&)Tmp, (TypeClass*)OldType.get());
- }
-
- void dump() const {
- std::cerr << "ValTypeBase instance!\n";
- }
-};
-
+}
//===----------------------------------------------------------------------===//
// FunctionValType - Define a class to hold the key that goes into the TypeMap
//
-class FunctionValType : public ValTypeBase<FunctionValType, FunctionType> {
- PATypeHandle RetTy;
- std::vector<PATypeHandle> ArgTypes;
+namespace llvm {
+class FunctionValType {
+ const Type *RetTy;
+ std::vector<const Type*> ArgTypes;
bool isVarArg;
public:
FunctionValType(const Type *ret, const std::vector<const Type*> &args,
- bool IVA, TypeMap<FunctionValType, FunctionType> &Tab)
- : ValTypeBase<FunctionValType, FunctionType>(Tab), RetTy(ret, this),
- isVarArg(IVA) {
+ bool IVA) : RetTy(ret), isVarArg(IVA) {
for (unsigned i = 0; i < args.size(); ++i)
- ArgTypes.push_back(PATypeHandle(args[i], this));
- }
-
- // We *MUST* have an explicit copy ctor so that the TypeHandles think that
- // this FunctionValType owns them, not the old one!
- //
- FunctionValType(const FunctionValType &MVT)
- : ValTypeBase<FunctionValType, FunctionType>(MVT), RetTy(MVT.RetTy, this),
- isVarArg(MVT.isVarArg) {
- ArgTypes.reserve(MVT.ArgTypes.size());
- for (unsigned i = 0; i < MVT.ArgTypes.size(); ++i)
- ArgTypes.push_back(PATypeHandle(MVT.ArgTypes[i], this));
+ ArgTypes.push_back(args[i]);
}
static FunctionValType get(const FunctionType *FT);
+ static unsigned hashTypeStructure(const FunctionType *FT) {
+ return FT->getNumParams()*2+FT->isVarArg();
+ }
+
// Subclass should override this... to update self as usual
- virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
+ 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;
}
- virtual void typeBecameConcrete(const DerivedType *Ty) {
- if (RetTy == Ty) RetTy.removeUserFromConcrete();
-
- for (unsigned i = 0; i < ArgTypes.size(); ++i)
- if (ArgTypes[i] == Ty) ArgTypes[i].removeUserFromConcrete();
- }
-
inline bool operator<(const FunctionValType &MTV) const {
- if (RetTy.get() < MTV.RetTy.get()) return true;
- if (RetTy.get() > MTV.RetTy.get()) return false;
+ if (RetTy < MTV.RetTy) return true;
+ if (RetTy > MTV.RetTy) return false;
if (ArgTypes < MTV.ArgTypes) return true;
- return (ArgTypes == MTV.ArgTypes) && isVarArg < MTV.isVarArg;
+ return ArgTypes == MTV.ArgTypes && isVarArg < MTV.isVarArg;
}
};
+}
// Define the actual map itself now...
static TypeMap<FunctionValType, FunctionType> FunctionTypes;
FunctionValType FunctionValType::get(const FunctionType *FT) {
// Build up a FunctionValType
std::vector<const Type *> ParamTypes;
- ParamTypes.reserve(FT->getParamTypes().size());
- for (unsigned i = 0, e = FT->getParamTypes().size(); i != e; ++i)
+ 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(),
- FunctionTypes);
+ return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg());
}
FunctionType *FunctionType::get(const Type *ReturnType,
const std::vector<const Type*> &Params,
bool isVarArg) {
- FunctionValType VT(ReturnType, Params, isVarArg, FunctionTypes);
+ FunctionValType VT(ReturnType, Params, isVarArg);
FunctionType *MT = FunctionTypes.get(VT);
if (MT) return MT;
return MT;
}
-void FunctionType::dropAllTypeUses(bool inMap) {
-#if 0
- if (inMap) FunctionTypes.remove(FunctionTypes.getEntryForType(this));
- // Drop all uses of other types, which might be recursive.
-#endif
- ResultType = OpaqueType::get();
- ParamTys.clear();
-}
-
-
//===----------------------------------------------------------------------===//
// Array Type Factory...
//
-class ArrayValType : public ValTypeBase<ArrayValType, ArrayType> {
- PATypeHandle ValTy;
+namespace llvm {
+class ArrayValType {
+ const Type *ValTy;
unsigned Size;
public:
- ArrayValType(const Type *val, int sz, TypeMap<ArrayValType, ArrayType> &Tab)
- : ValTypeBase<ArrayValType, ArrayType>(Tab), ValTy(val, this), Size(sz) {}
-
- // We *MUST* have an explicit copy ctor so that the ValTy thinks that this
- // ArrayValType owns it, not the old one!
- //
- ArrayValType(const ArrayValType &AVT)
- : ValTypeBase<ArrayValType, ArrayType>(AVT), ValTy(AVT.ValTy, this),
- Size(AVT.Size) {}
+ ArrayValType(const Type *val, int sz) : ValTy(val), Size(sz) {}
- static ArrayValType get(const ArrayType *AT);
+ 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
- virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
+ void doRefinement(const DerivedType *OldType, const Type *NewType) {
assert(ValTy == OldType);
ValTy = NewType;
}
- virtual void typeBecameConcrete(const DerivedType *Ty) {
- assert(ValTy == Ty &&
- "Contained type became concrete but we're not using it!");
- ValTy.removeUserFromConcrete();
- }
-
inline bool operator<(const ArrayValType &MTV) const {
if (Size < MTV.Size) return true;
- return Size == MTV.Size && ValTy.get() < MTV.ValTy.get();
+ return Size == MTV.Size && ValTy < MTV.ValTy;
}
};
-
-static TypeMap<ArrayValType, ArrayType> ArrayTypes;
-
-ArrayValType ArrayValType::get(const ArrayType *AT) {
- return ArrayValType(AT->getElementType(), AT->getNumElements(), ArrayTypes);
}
+static TypeMap<ArrayValType, ArrayType> ArrayTypes;
ArrayType *ArrayType::get(const Type *ElementType, unsigned NumElements) {
assert(ElementType && "Can't get array of null types!");
- ArrayValType AVT(ElementType, NumElements, ArrayTypes);
+ ArrayValType AVT(ElementType, NumElements);
ArrayType *AT = ArrayTypes.get(AVT);
if (AT) return AT; // Found a match, return it!
return AT;
}
-void ArrayType::dropAllTypeUses(bool inMap) {
-#if 0
- if (inMap) ArrayTypes.remove(ArrayTypes.getEntryForType(this));
-#endif
- ElementType = OpaqueType::get();
-}
-
-
-
-
//===----------------------------------------------------------------------===//
// Struct Type Factory...
//
+namespace llvm {
// StructValType - Define a class to hold the key that goes into the TypeMap
//
-class StructValType : public ValTypeBase<StructValType, StructType> {
- std::vector<PATypeHandle> ElTypes;
+class StructValType {
+ std::vector<const Type*> ElTypes;
public:
- StructValType(const std::vector<const Type*> &args,
- TypeMap<StructValType, StructType> &Tab)
- : ValTypeBase<StructValType, StructType>(Tab) {
- ElTypes.reserve(args.size());
- for (unsigned i = 0, e = args.size(); i != e; ++i)
- ElTypes.push_back(PATypeHandle(args[i], this));
- }
+ StructValType(const std::vector<const Type*> &args) : ElTypes(args) {}
- // We *MUST* have an explicit copy ctor so that the TypeHandles think that
- // this StructValType owns them, not the old one!
- //
- StructValType(const StructValType &SVT)
- : ValTypeBase<StructValType, StructType>(SVT){
- ElTypes.reserve(SVT.ElTypes.size());
- for (unsigned i = 0, e = SVT.ElTypes.size(); i != e; ++i)
- ElTypes.push_back(PATypeHandle(SVT.ElTypes[i], this));
+ 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);
}
- static StructValType get(const StructType *ST);
+ static unsigned hashTypeStructure(const StructType *ST) {
+ return ST->getNumElements();
+ }
// Subclass should override this... to update self as usual
- virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
+ void doRefinement(const DerivedType *OldType, const Type *NewType) {
for (unsigned i = 0; i < ElTypes.size(); ++i)
if (ElTypes[i] == OldType) ElTypes[i] = NewType;
}
- virtual void typeBecameConcrete(const DerivedType *Ty) {
- for (unsigned i = 0, e = ElTypes.size(); i != e; ++i)
- if (ElTypes[i] == Ty)
- ElTypes[i].removeUserFromConcrete();
- }
-
inline bool operator<(const StructValType &STV) const {
return ElTypes < STV.ElTypes;
}
};
-
-static TypeMap<StructValType, StructType> StructTypes;
-
-StructValType StructValType::get(const StructType *ST) {
- std::vector<const Type *> ElTypes;
- ElTypes.reserve(ST->getElementTypes().size());
- for (unsigned i = 0, e = ST->getElementTypes().size(); i != e; ++i)
- ElTypes.push_back(ST->getElementTypes()[i]);
-
- return StructValType(ElTypes, StructTypes);
}
-
+static TypeMap<StructValType, StructType> StructTypes;
StructType *StructType::get(const std::vector<const Type*> &ETypes) {
- StructValType STV(ETypes, StructTypes);
+ StructValType STV(ETypes);
StructType *ST = StructTypes.get(STV);
if (ST) return ST;
return ST;
}
-void StructType::dropAllTypeUses(bool inMap) {
-#if 0
- if (inMap) StructTypes.remove(StructTypes.getEntryForType(this));
-#endif
- ETypes.clear();
- ETypes.push_back(PATypeHandle(OpaqueType::get(), this));
-}
-
//===----------------------------------------------------------------------===//
// PointerValType - Define a class to hold the key that goes into the TypeMap
//
-class PointerValType : public ValTypeBase<PointerValType, PointerType> {
- PATypeHandle ValTy;
+namespace llvm {
+class PointerValType {
+ const Type *ValTy;
public:
- PointerValType(const Type *val, TypeMap<PointerValType, PointerType> &Tab)
- : ValTypeBase<PointerValType, PointerType>(Tab), ValTy(val, this) {}
+ PointerValType(const Type *val) : ValTy(val) {}
- // We *MUST* have an explicit copy ctor so that the ValTy thinks that this
- // PointerValType owns it, not the old one!
- //
- PointerValType(const PointerValType &PVT)
- : ValTypeBase<PointerValType, PointerType>(PVT), ValTy(PVT.ValTy, this) {}
+ static PointerValType get(const PointerType *PT) {
+ return PointerValType(PT->getElementType());
+ }
- static PointerValType get(const PointerType *PT);
+ static unsigned hashTypeStructure(const PointerType *PT) {
+ return 0;
+ }
// Subclass should override this... to update self as usual
- virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
+ void doRefinement(const DerivedType *OldType, const Type *NewType) {
assert(ValTy == OldType);
ValTy = NewType;
}
- virtual void typeBecameConcrete(const DerivedType *Ty) {
- assert(ValTy == Ty &&
- "Contained type became concrete but we're not using it!");
- ValTy.removeUserFromConcrete();
- }
-
- inline bool operator<(const PointerValType &MTV) const {
- return ValTy.get() < MTV.ValTy.get();
+ bool operator<(const PointerValType &MTV) const {
+ return ValTy < MTV.ValTy;
}
};
-
-static TypeMap<PointerValType, PointerType> PointerTypes;
-
-PointerValType PointerValType::get(const PointerType *PT) {
- return PointerValType(PT->getElementType(), PointerTypes);
}
+static TypeMap<PointerValType, PointerType> PointerTypes;
PointerType *PointerType::get(const Type *ValueType) {
assert(ValueType && "Can't get a pointer to <null> type!");
- PointerValType PVT(ValueType, PointerTypes);
+ PointerValType PVT(ValueType);
PointerType *PT = PointerTypes.get(PVT);
if (PT) return PT;
return PT;
}
-void PointerType::dropAllTypeUses(bool inMap) {
-#if 0
- if (inMap) PointerTypes.remove(PointerTypes.getEntryForType(this));
-#endif
- ElementType = OpaqueType::get();
-}
-
-void debug_type_tables() {
- FunctionTypes.dump();
- ArrayTypes.dump();
- StructTypes.dump();
- PointerTypes.dump();
-}
-
//===----------------------------------------------------------------------===//
// Derived Type Refinement Functions
//===----------------------------------------------------------------------===//
-// addAbstractTypeUser - Notify an abstract type that there is a new user of
-// it. This function is called primarily by the PATypeHandle class.
-//
-void DerivedType::addAbstractTypeUser(AbstractTypeUser *U) const {
- assert(isAbstract() && "addAbstractTypeUser: Current type not abstract!");
-
-#if DEBUG_MERGE_TYPES
- std::cerr << " addAbstractTypeUser[" << (void*)this << ", "
- << *this << "][" << AbstractTypeUsers.size()
- << "] User = " << U << "\n";
-#endif
- AbstractTypeUsers.push_back(U);
-}
-
-
// removeAbstractTypeUser - Notify an abstract type that a user of the class
// no longer has a handle to the type. This function is called primarily by
// the PATypeHandle class. When there are no users of the abstract type, it
-// is anihilated, because there is no way to get a reference to it ever again.
+// is annihilated, because there is no way to get a reference to it ever again.
//
void DerivedType::removeAbstractTypeUser(AbstractTypeUser *U) const {
// Search from back to front because we will notify users from back to
<< *this << "][" << i << "] User = " << U << "\n";
#endif
- if (AbstractTypeUsers.empty() && isAbstract()) {
+ if (AbstractTypeUsers.empty() && RefCount == 0 && isAbstract()) {
#ifdef DEBUG_MERGE_TYPES
std::cerr << "DELETEing unused abstract type: <" << *this
<< ">[" << (void*)this << "]" << "\n";
}
-// refineAbstractTypeToInternal - This function is used to 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.
+// refineAbstractTypeTo - This function is used to 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.
//
-void DerivedType::refineAbstractTypeToInternal(const Type *NewType, bool inMap){
+void DerivedType::refineAbstractTypeTo(const Type *NewType) {
assert(isAbstract() && "refineAbstractTypeTo: Current type is not abstract!");
assert(this != NewType && "Can't refine to myself!");
-
+ assert(ForwardType == 0 && "This type has already been refined!");
+
// The descriptions may be out of date. Conservatively clear them all!
AbstractTypeDescriptions.clear();
<< *NewType << "]!\n";
#endif
-
// Make sure to put the type to be refined to into a holder so that if IT gets
// refined, that we will not continue using a dead reference...
//
PATypeHolder NewTy(NewType);
+ // Any PATypeHolders referring to this type will now automatically forward to
+ // the type we are resolved to.
+ ForwardType = NewType;
+ if (NewType->isAbstract())
+ cast<DerivedType>(NewType)->addRef();
+
// Add a self use of the current type so that we don't delete ourself until
- // after this while loop. We are careful to never invoke refine on ourself,
- // so this extra reference shouldn't be a problem. Note that we must only
- // remove a single reference at the end, but we must tolerate multiple self
- // references because we could be refineAbstractTypeTo'ing recursively on the
- // same type.
+ // after the function exits.
//
- addAbstractTypeUser(this);
+ PATypeHolder CurrentTy(this);
// To make the situation simpler, we ask the subclass to remove this type from
// the type map, and to replace any type uses with uses of non-abstract types.
// This dramatically limits the amount of recursive type trouble we can find
// ourselves in.
- dropAllTypeUses(inMap);
-
- // Count the number of self uses. Stop looping when sizeof(list) == NSU.
- unsigned NumSelfUses = 0;
+ dropAllTypeUses();
// Iterate over all of the uses of this type, invoking callback. Each user
// should remove itself from our use list automatically. We have to check to
// will not cause users to drop off of the use list. If we resolve to ourself
// we succeed!
//
- while (AbstractTypeUsers.size() > NumSelfUses && NewTy != this) {
+ while (!AbstractTypeUsers.empty() && NewTy != this) {
AbstractTypeUser *User = AbstractTypeUsers.back();
- if (User == this) {
- // Move self use to the start of the list. Increment NSU.
- std::swap(AbstractTypeUsers.back(), AbstractTypeUsers[NumSelfUses++]);
- } else {
- unsigned OldSize = AbstractTypeUsers.size();
+ 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";
+ std::cerr << " REFINING user " << OldSize-1 << "[" << (void*)User
+ << "] of abstract type [" << (void*)this << " "
+ << *this << "] to [" << (void*)NewTy.get() << " "
+ << *NewTy << "]!\n";
#endif
- User->refineAbstractType(this, NewTy);
+ User->refineAbstractType(this, NewTy);
-#ifdef DEBUG_MERGE_TYPES
- if (AbstractTypeUsers.size() == OldSize) {
- User->refineAbstractType(this, NewTy);
- if (AbstractTypeUsers.back() != User)
- std::cerr << "User changed!\n";
- std::cerr << "Top of user list is:\n";
- AbstractTypeUsers.back()->dump();
-
- std::cerr <<"\nOld User=\n";
- User->dump();
- }
-#endif
- assert(AbstractTypeUsers.size() != OldSize &&
- "AbsTyUser did not remove self from user list!");
- }
+ assert(AbstractTypeUsers.size() != OldSize &&
+ "AbsTyUser did not remove self from user list!");
}
- // Remove a single self use, even though there may be several here. This will
- // probably 'delete this', so no instance variables may be used after this
- // occurs...
- //
- assert((NewTy == this || AbstractTypeUsers.back() == this) &&
- "Only self uses should be left!");
-
-#if 0
- assert(AbstractTypeUsers.size() == 1 && "This type should get deleted!");
-#endif
- removeAbstractTypeUser(this);
+ // If we were successful removing all users from the type, 'this' will be
+ // deleted when the last PATypeHolder is destroyed or updated from this type.
+ // This may occur on exit of this function, as the CurrentTy object is
+ // destroyed.
}
-// typeIsRefined - Notify AbstractTypeUsers of this type that the current type
-// has been refined a bit. The pointer is still valid and still should be
-// used, but the subtypes have changed.
+// notifyUsesThatTypeBecameConcrete - Notify AbstractTypeUsers of this type that
+// the current type has transitioned from being abstract to being concrete.
//
-void DerivedType::typeIsRefined() {
- assert(isRefining >= 0 && isRefining <= 2 && "isRefining out of bounds!");
- if (isRefining == 1) return; // Kill recursion here...
- ++isRefining;
-
+void DerivedType::notifyUsesThatTypeBecameConcrete() {
#ifdef DEBUG_MERGE_TYPES
std::cerr << "typeIsREFINED type: " << (void*)this << " " << *this << "\n";
#endif
- // In this loop we have to be very careful not to get into infinite loops and
- // other problem cases. Specifically, we loop through all of the abstract
- // type users in the user list, notifying them that the type has been refined.
- // At their choice, they may or may not choose to remove themselves from the
- // list of users. Regardless of whether they do or not, we have to be sure
- // that we only notify each user exactly once. Because the refineAbstractType
- // method can cause an arbitrary permutation to the user list, we cannot loop
- // through it in any particular order and be guaranteed that we will be
- // successful at this aim. Because of this, we keep track of all the users we
- // have visited and only visit users we have not seen. Because this user list
- // should be small, we use a vector instead of a full featured set to keep
- // track of what users we have notified so far.
- //
- std::vector<AbstractTypeUser*> Refined;
- while (1) {
- unsigned i;
- for (i = AbstractTypeUsers.size(); i != 0; --i)
- if (find(Refined.begin(), Refined.end(), AbstractTypeUsers[i-1]) ==
- Refined.end())
- break; // Found an unrefined user?
-
- if (i == 0) break; // Noone to refine left, break out of here!
-
- AbstractTypeUser *ATU = AbstractTypeUsers[--i];
- Refined.push_back(ATU); // Keep track of which users we have refined!
+ unsigned OldSize = AbstractTypeUsers.size();
+ while (!AbstractTypeUsers.empty()) {
+ AbstractTypeUser *ATU = AbstractTypeUsers.back();
+ ATU->typeBecameConcrete(this);
-#ifdef DEBUG_MERGE_TYPES
- std::cerr << " typeIsREFINED user " << i << "[" << ATU
- << "] of abstract type [" << (void*)this << " "
- << *this << "]\n";
-#endif
- ATU->refineAbstractType(this, this);
- }
-
- --isRefining;
-
-#ifndef _NDEBUG
- if (!(isAbstract() || AbstractTypeUsers.empty()))
- for (unsigned i = 0; i < AbstractTypeUsers.size(); ++i) {
- if (AbstractTypeUsers[i] != this) {
- // Debugging hook
- std::cerr << "FOUND FAILURE\nUser: ";
- AbstractTypeUsers[i]->dump();
- std::cerr << "\nCatch:\n";
- AbstractTypeUsers[i]->refineAbstractType(this, this);
- assert(0 && "Type became concrete,"
- " but it still has abstract type users hanging around!");
- }
+ assert(AbstractTypeUsers.size() < OldSize-- &&
+ "AbstractTypeUser did not remove itself from the use list!");
}
-#endif
}
//
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..
-#if 0
- TypeMap<FunctionValType, FunctionType>::iterator TMI =
- FunctionTypes.getEntryForType(this);
-#endif
-
- // Find the type element we are refining...
- if (ResultType == OldType) {
- ResultType.removeUserFromConcrete();
- ResultType = NewType;
- }
- for (unsigned i = 0, e = ParamTys.size(); i != e; ++i)
- if (ParamTys[i] == OldType) {
- ParamTys[i].removeUserFromConcrete();
- ParamTys[i] = NewType;
- }
+ FunctionTypes.finishRefinement(this, OldType, NewType);
+}
- FunctionTypes.finishRefinement(this);
+void FunctionType::typeBecameConcrete(const DerivedType *AbsTy) {
+ refineAbstractType(AbsTy, 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
-
-#if 0
- // Look up our current type map entry..
- TypeMap<ArrayValType, ArrayType>::iterator TMI =
- ArrayTypes.getEntryForType(this);
-#endif
-
- assert(getElementType() == OldType);
- ElementType.removeUserFromConcrete();
- ElementType = NewType;
+ ArrayTypes.finishRefinement(this, OldType, NewType);
+}
- ArrayTypes.finishRefinement(this);
+void ArrayType::typeBecameConcrete(const DerivedType *AbsTy) {
+ refineAbstractType(AbsTy, 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
-
-#if 0
- // Look up our current type map entry..
- TypeMap<StructValType, StructType>::iterator TMI =
- StructTypes.getEntryForType(this);
-#endif
-
- for (int i = ETypes.size()-1; i >= 0; --i)
- if (ETypes[i] == OldType) {
- ETypes[i].removeUserFromConcrete();
-
- // Update old type to new type in the array...
- ETypes[i] = NewType;
- }
+ StructTypes.finishRefinement(this, OldType, NewType);
+}
- StructTypes.finishRefinement(this);
+void StructType::typeBecameConcrete(const DerivedType *AbsTy) {
+ refineAbstractType(AbsTy, AbsTy);
}
// refineAbstractType - Called when a contained type is found to be more
//
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
-
-#if 0
- // Look up our current type map entry..
- TypeMap<PointerValType, PointerType>::iterator TMI =
- PointerTypes.getEntryForType(this);
-#endif
-
- assert(ElementType == OldType);
- ElementType.removeUserFromConcrete();
- ElementType = NewType;
-
- PointerTypes.finishRefinement(this);
+ PointerTypes.finishRefinement(this, OldType, NewType);
}
+void PointerType::typeBecameConcrete(const DerivedType *AbsTy) {
+ refineAbstractType(AbsTy, AbsTy);
+}
projects / oota-llvm.git / blobdiff