-//===-- Type.cpp - Implement the Type class ----------------------*- C++ -*--=//
+//===-- Type.cpp - Implement the Type class -------------------------------===//
//
// This file implements the Type class for the VMCore library.
//
#include "llvm/DerivedTypes.h"
#include "llvm/SymbolTable.h"
+#include "llvm/Constants.h"
#include "Support/StringExtras.h"
#include "Support/STLExtras.h"
-#include <iostream>
-
-using std::vector;
-using std::string;
-using std::map;
-using std::swap;
-using std::make_pair;
-using std::cerr;
+#include <algorithm>
// 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
-
//===----------------------------------------------------------------------===//
// Type Class Implementation
//===----------------------------------------------------------------------===//
static unsigned CurUID = 0;
-static vector<const Type *> UIDMappings;
+static std::vector<const Type *> UIDMappings;
+
+// Concrete/Abstract TypeDescriptions - We lazily calculate type descriptions
+// 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;
void PATypeHolder::dump() const {
- cerr << "PATypeHolder(" << (void*)this << ")\n";
+ std::cerr << "PATypeHolder(" << (void*)this << ")\n";
}
-Type::Type(const string &name, PrimitiveID id)
+Type::Type(const std::string &name, PrimitiveID id)
: Value(Type::TypeTy, Value::TypeVal) {
- setDescription(name);
+ if (!name.empty())
+ ConcreteTypeDescriptions[this] = name;
ID = id;
- Abstract = Recursive = false;
+ Abstract = false;
UID = CurUID++; // Assign types UID's as they are created
UIDMappings.push_back(this);
}
-void Type::setName(const string &Name, SymbolTable *ST) {
+void Type::setName(const std::string &Name, SymbolTable *ST) {
assert(ST && "Type::setName - Must provide symbol table argument!");
if (Name.size()) ST->insert(Name, this);
}
}
-// isLosslesslyConvertableTo - Return true if this type can be converted to
+// isLosslesslyConvertibleTo - Return true if this type can be converted to
// 'Ty' without any reinterpretation of bits. For example, uint to int.
//
-bool Type::isLosslesslyConvertableTo(const Type *Ty) const {
+bool Type::isLosslesslyConvertibleTo(const Type *Ty) const {
if (this == Ty) return true;
- if ((!isPrimitiveType() && !isPointerType()) ||
- (!Ty->isPointerType() && !Ty->isPrimitiveType())) return false;
+ if ((!isPrimitiveType() && !isa<PointerType>(this)) ||
+ (!isa<PointerType>(Ty) && !Ty->isPrimitiveType())) return false;
if (getPrimitiveID() == Ty->getPrimitiveID())
return true; // Handles identity cast, and cast of differing pointer types
case Type::ULongTyID:
case Type::LongTyID:
case Type::PointerTyID:
- return Ty == Type::ULongTy || Ty == Type::LongTy ||
- Ty->getPrimitiveID() == Type::PointerTyID;
+ return Ty == Type::ULongTy || Ty == Type::LongTy || 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
+// 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 {
+ switch (getPrimitiveID()) {
+#define HANDLE_PRIM_TYPE(TY,SIZE) case TY##TyID: return SIZE;
+#include "llvm/Type.def"
+ default: return 0;
+ }
+}
+
+
+// getTypeDescription - This is a recursive function that walks a type hierarchy
+// calculating the description for a type.
+//
+static std::string getTypeDescription(const Type *Ty,
+ 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)
+ return I->second;
+ std::string Desc = "opaque"+utostr(Ty->getUniqueID());
+ 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
+ // 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->getPrimitiveID()) {
+ 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())
+ Result += ", ";
+ Result += getTypeDescription(*I, TypeStack);
+ }
+ if (FTy->isVarArg()) {
+ if (!FTy->getParamTypes().empty()) Result += ", ";
+ Result += "...";
+ }
+ Result += ")";
+ break;
+ }
+ 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())
+ Result += ", ";
+ Result += getTypeDescription(*I, TypeStack);
+ }
+ Result += " }";
+ break;
+ }
+ case Type::PointerTyID: {
+ const PointerType *PTy = cast<PointerType>(Ty);
+ Result = getTypeDescription(PTy->getElementType(), TypeStack) + " *";
+ break;
+ }
+ case Type::ArrayTyID: {
+ const ArrayType *ATy = cast<ArrayType>(Ty);
+ unsigned NumElements = ATy->getNumElements();
+ Result = "[";
+ Result += utostr(NumElements) + " x ";
+ Result += getTypeDescription(ATy->getElementType(), TypeStack) + "]";
+ break;
+ }
+ default:
+ Result = "<error>";
+ assert(0 && "Unhandled type in getTypeDescription!");
+ }
+
+ TypeStack.pop_back(); // Remove self from stack...
+
+ return Result;
+}
+
+
+
+static const std::string &getOrCreateDesc(std::map<const Type*,std::string>&Map,
+ 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);
+}
+
+
+const std::string &Type::getDescription() const {
+ if (isAbstract())
+ return getOrCreateDesc(AbstractTypeDescriptions, this);
+ else
+ return getOrCreateDesc(ConcreteTypeDescriptions, this);
+}
+
bool StructType::indexValid(const Value *V) const {
if (!isa<Constant>(V)) return false;
// These classes are used to implement specialized behavior for each different
// type.
//
-class SignedIntType : public Type {
- int Size;
-public:
- SignedIntType(const string &Name, PrimitiveID id, int size) : Type(Name, id) {
- Size = size;
- }
+struct SignedIntType : public Type {
+ SignedIntType(const std::string &Name, PrimitiveID id) : Type(Name, id) {}
// isSigned - Return whether a numeric type is signed.
virtual bool isSigned() const { return 1; }
- // isIntegral - Equivalent to isSigned() || isUnsigned, but with only a single
+ // isInteger - Equivalent to isSigned() || isUnsigned, but with only a single
// virtual function invocation.
//
- virtual bool isIntegral() const { return 1; }
+ virtual bool isInteger() const { return 1; }
};
-class UnsignedIntType : public Type {
- uint64_t Size;
-public:
- UnsignedIntType(const string &N, PrimitiveID id, int size) : Type(N, id) {
- Size = size;
- }
+struct UnsignedIntType : public Type {
+ UnsignedIntType(const std::string &N, PrimitiveID id) : Type(N, id) {}
// isUnsigned - Return whether a numeric type is signed.
virtual bool isUnsigned() const { return 1; }
- // isIntegral - Equivalent to isSigned() || isUnsigned, but with only a single
+ // isInteger - Equivalent to isSigned() || isUnsigned, but with only a single
// virtual function invocation.
//
- virtual bool isIntegral() const { return 1; }
+ virtual bool isInteger() const { return 1; }
+};
+
+struct OtherType : public Type {
+ OtherType(const std::string &N, PrimitiveID id) : Type(N, id) {}
};
static struct TypeType : public Type {
TypeType() : Type("type", TypeTyID) {}
-} TheTypeType; // Implement the type that is global.
+} TheTypeTy; // Implement the type that is global.
//===----------------------------------------------------------------------===//
// Static 'Type' data
//===----------------------------------------------------------------------===//
-Type *Type::VoidTy = new Type("void" , VoidTyID),
- *Type::BoolTy = new Type("bool" , BoolTyID),
- *Type::SByteTy = new SignedIntType("sbyte" , SByteTyID, 1),
- *Type::UByteTy = new UnsignedIntType("ubyte" , UByteTyID, 1),
- *Type::ShortTy = new SignedIntType("short" , ShortTyID, 2),
- *Type::UShortTy = new UnsignedIntType("ushort", UShortTyID, 2),
- *Type::IntTy = new SignedIntType("int" , IntTyID, 4),
- *Type::UIntTy = new UnsignedIntType("uint" , UIntTyID, 4),
- *Type::LongTy = new SignedIntType("long" , LongTyID, 8),
- *Type::ULongTy = new UnsignedIntType("ulong" , ULongTyID, 8),
- *Type::FloatTy = new Type("float" , FloatTyID),
- *Type::DoubleTy = new Type("double", DoubleTyID),
- *Type::TypeTy = &TheTypeType,
- *Type::LabelTy = new Type("label" , LabelTyID);
+static OtherType TheVoidTy ("void" , Type::VoidTyID);
+static OtherType TheBoolTy ("bool" , Type::BoolTyID);
+static SignedIntType TheSByteTy ("sbyte" , Type::SByteTyID);
+static UnsignedIntType TheUByteTy ("ubyte" , Type::UByteTyID);
+static SignedIntType TheShortTy ("short" , Type::ShortTyID);
+static UnsignedIntType TheUShortTy("ushort", Type::UShortTyID);
+static SignedIntType TheIntTy ("int" , Type::IntTyID);
+static UnsignedIntType TheUIntTy ("uint" , Type::UIntTyID);
+static SignedIntType TheLongTy ("long" , Type::LongTyID);
+static UnsignedIntType TheULongTy ("ulong" , Type::ULongTyID);
+static OtherType TheFloatTy ("float" , Type::FloatTyID);
+static OtherType TheDoubleTy("double", Type::DoubleTyID);
+static OtherType 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::TypeTy = &TheTypeTy;
+Type *Type::LabelTy = &TheLabelTy;
//===----------------------------------------------------------------------===//
//===----------------------------------------------------------------------===//
FunctionType::FunctionType(const Type *Result,
- const vector<const Type*> &Params,
+ const std::vector<const Type*> &Params,
bool IsVarArgs) : DerivedType(FunctionTyID),
- ResultType(PATypeHandle<Type>(Result, this)),
+ ResultType(PATypeHandle(Result, this)),
isVarArgs(IsVarArgs) {
+ bool isAbstract = Result->isAbstract();
ParamTys.reserve(Params.size());
- for (unsigned i = 0; i < Params.size(); ++i)
- ParamTys.push_back(PATypeHandle<Type>(Params[i], this));
+ for (unsigned i = 0; i < Params.size(); ++i) {
+ ParamTys.push_back(PATypeHandle(Params[i], this));
+ isAbstract |= Params[i]->isAbstract();
+ }
- setDerivedTypeProperties();
+ // Calculate whether or not this type is abstract
+ setAbstract(isAbstract);
}
-StructType::StructType(const vector<const Type*> &Types)
+StructType::StructType(const std::vector<const Type*> &Types)
: CompositeType(StructTyID) {
ETypes.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<Type>(Types[i], this));
+ ETypes.push_back(PATypeHandle(Types[i], this));
+ isAbstract |= Types[i]->isAbstract();
}
- setDerivedTypeProperties();
+
+ // Calculate whether or not this type is abstract
+ setAbstract(isAbstract);
}
ArrayType::ArrayType(const Type *ElType, unsigned NumEl)
: SequentialType(ArrayTyID, ElType) {
NumElements = NumEl;
- setDerivedTypeProperties();
+
+ // Calculate whether or not this type is abstract
+ setAbstract(ElType->isAbstract());
}
PointerType::PointerType(const Type *E) : SequentialType(PointerTyID, E) {
- setDerivedTypeProperties();
+ // Calculate whether or not this type is abstract
+ setAbstract(E->isAbstract());
}
OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {
setAbstract(true);
- setDescription("opaque"+utostr(getUniqueID()));
#ifdef DEBUG_MERGE_TYPES
- cerr << "Derived new type: " << getDescription() << endl;
+ std::cerr << "Derived new type: " << *this << "\n";
#endif
}
-
-
-//===----------------------------------------------------------------------===//
-// Derived Type setDerivedTypeProperties Function
-//===----------------------------------------------------------------------===//
-
-// getTypeProps - This is a recursive function that walks a type hierarchy
-// calculating the description for a type and whether or not it is abstract or
-// recursive. 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.
+// 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.
//
-static string getTypeProps(const Type *Ty, vector<const Type *> &TypeStack,
- bool &isAbstract, bool &isRecursive) {
- string Result;
- if (!Ty->isAbstract() && !Ty->isRecursive() && // Base case for the recursion
- Ty->getDescription().size()) {
- Result = Ty->getDescription(); // Primitive = leaf type
- } else if (isa<OpaqueType>(Ty)) { // Base case for the recursion
- Result = Ty->getDescription(); // Opaque = leaf type
- isAbstract = true; // This whole type is abstract!
- } else {
- // 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
- // that we have looped back to a type that we have previously visited.
- // Generate the appropriate upreference to handle this.
- //
- if (Slot < CurSize) {
- Result = "\\" + utostr(CurSize-Slot); // Here's the upreference
- isRecursive = true; // We know we are recursive
- } else { // Recursive case: abstract derived type...
- TypeStack.push_back(Ty); // Add us to the stack..
-
- switch (Ty->getPrimitiveID()) {
- case Type::FunctionTyID: {
- const FunctionType *MTy = cast<const FunctionType>(Ty);
- Result = getTypeProps(MTy->getReturnType(), TypeStack,
- isAbstract, isRecursive)+" (";
- for (FunctionType::ParamTypes::const_iterator
- I = MTy->getParamTypes().begin(),
- E = MTy->getParamTypes().end(); I != E; ++I) {
- if (I != MTy->getParamTypes().begin())
- Result += ", ";
- Result += getTypeProps(*I, TypeStack, isAbstract, isRecursive);
- }
- if (MTy->isVarArg()) {
- if (!MTy->getParamTypes().empty()) Result += ", ";
- Result += "...";
- }
- Result += ")";
- break;
- }
- case Type::StructTyID: {
- const StructType *STy = cast<const StructType>(Ty);
- Result = "{ ";
- for (StructType::ElementTypes::const_iterator
- I = STy->getElementTypes().begin(),
- E = STy->getElementTypes().end(); I != E; ++I) {
- if (I != STy->getElementTypes().begin())
- Result += ", ";
- Result += getTypeProps(*I, TypeStack, isAbstract, isRecursive);
- }
- Result += " }";
- break;
- }
- case Type::PointerTyID: {
- const PointerType *PTy = cast<const PointerType>(Ty);
- Result = getTypeProps(PTy->getElementType(), TypeStack,
- isAbstract, isRecursive) + " *";
- break;
- }
- case Type::ArrayTyID: {
- const ArrayType *ATy = cast<const ArrayType>(Ty);
- unsigned NumElements = ATy->getNumElements();
- Result = "[";
- Result += utostr(NumElements) + " x ";
- Result += getTypeProps(ATy->getElementType(), TypeStack,
- isAbstract, isRecursive) + "]";
- break;
- }
- default:
- assert(0 && "Unhandled case in getTypeProps!");
- Result = "<error>";
- }
-
- TypeStack.pop_back(); // Remove self from stack...
+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)->isTypeAbstract()) {
+ setAbstract(true); // Restore the abstract bit.
+ return true; // This type is abstract if subtype is abstract!
}
- }
- return Result;
-}
-
-
-// setDerivedTypeProperties - This function is used to calculate the
-// isAbstract, isRecursive, and the Description settings for a type. The
-// getTypeProps function does all the dirty work.
-//
-void DerivedType::setDerivedTypeProperties() {
- vector<const Type *> TypeStack;
- bool isAbstract = false, isRecursive = false;
- setDescription(getTypeProps(this, TypeStack, isAbstract, isRecursive));
- setAbstract(isAbstract);
- setRecursive(isRecursive);
+ // Restore the abstract bit.
+ setAbstract(true);
+
+ // Nothing looks abstract here...
+ return false;
}
// that assumes that two graphs are the same until proven otherwise.
//
static bool TypesEqual(const Type *Ty, const Type *Ty2,
- map<const Type *, const Type *> &EqTypes) {
+ 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
- map<const Type*, const Type*>::iterator It = EqTypes.find(Ty);
+ std::map<const Type*, const Type*>::iterator It = EqTypes.find(Ty);
if (It != EqTypes.end())
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(make_pair(Ty, Ty2));
+ 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();
// Two really annoying special cases that breaks an otherwise nice simple
// algorithm is the fact that arraytypes have sizes that differentiates types,
- // and that method types can be varargs or not. Consider this now.
+ // and that function types can be varargs or not. Consider this now.
if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
- if (ATy->getNumElements() != cast<const ArrayType>(Ty2)->getNumElements())
+ if (ATy->getNumElements() != cast<ArrayType>(Ty2)->getNumElements())
return false;
- } else if (const FunctionType *MTy = dyn_cast<FunctionType>(Ty)) {
- if (MTy->isVarArg() != cast<const FunctionType>(Ty2)->isVarArg())
+ } else if (const FunctionType *FTy = dyn_cast<FunctionType>(Ty)) {
+ if (FTy->isVarArg() != cast<FunctionType>(Ty2)->isVarArg())
return false;
}
}
static bool TypesEqual(const Type *Ty, const Type *Ty2) {
- map<const Type *, const Type *> EqTypes;
+ std::map<const Type *, const Type *> EqTypes;
return TypesEqual(Ty, Ty2, EqTypes);
}
//
template<class ValType, class TypeClass>
class TypeMap : public AbstractTypeUser {
- typedef map<ValType, PATypeHandle<TypeClass> > MapTy;
+ typedef std::map<ValType, PATypeHandle> MapTy;
MapTy Map;
public:
-
+ typedef typename MapTy::iterator iterator;
~TypeMap() { print("ON EXIT"); }
inline TypeClass *get(const ValType &V) {
- map<ValType, PATypeHandle<TypeClass> >::iterator I = Map.find(V);
- // TODO: FIXME: When Types are not CONST.
- return (I != Map.end()) ? (TypeClass*)I->second.get() : 0;
+ iterator I = Map.find(V);
+ return I != Map.end() ? (TypeClass*)I->second.get() : 0;
}
inline void add(const ValType &V, TypeClass *T) {
- Map.insert(make_pair(V, PATypeHandle<TypeClass>(T, this)));
+ Map.insert(std::make_pair(V, PATypeHandle(T, this)));
print("add");
}
- // containsEquivalent - Return true if the typemap contains a type that is
- // structurally equivalent to the specified type.
- //
- inline const TypeClass *containsEquivalent(const TypeClass *Ty) {
- for (MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
- if (I->second.get() != Ty && TypesEqual(Ty, I->second.get()))
- return (TypeClass*)I->second.get(); // FIXME TODO when types not const
- return 0;
+ 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 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())) {
+ 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
+ // Refined to a different type altogether?
+ Ty->refineAbstractTypeToInternal(NewTy, false);
+ return;
+ }
+
+ // 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());
+
+ // 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
// corrected.
//
virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
- assert(OldTy == NewTy || OldTy->isAbstract());
- if (OldTy == NewTy) {
- if (!OldTy->isAbstract()) {
- // Check to see if the type just became concrete.
- // If so, remove self from user list.
- for (MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
- if (I->second == OldTy)
- I->second.removeUserFromConcrete();
- }
- return;
- }
#ifdef DEBUG_MERGE_TYPES
- cerr << "Removing Old type from Tab: " << (void*)OldTy << ", "
- << OldTy->getDescription() << " replacement == " << (void*)NewTy
- << ", " << NewTy->getDescription() << endl;
+ std::cerr << "Removing Old type from Tab: " << (void*)OldTy << ", "
+ << *OldTy << " replacement == " << (void*)NewTy
+ << ", " << *NewTy << "\n";
#endif
- for (MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
- if (I->second == OldTy) {
- Map.erase(I);
- print("refineAbstractType after");
- return;
+ 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);
}
- assert(0 && "Abstract type not found in table!");
}
void remove(const ValType &OldVal) {
- MapTy::iterator I = Map.find(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
- cerr << "TypeMap<>::" << Arg << " table contents:\n";
+ std::cerr << "TypeMap<>::" << Arg << " table contents:\n";
unsigned i = 0;
- for (MapTy::const_iterator I = Map.begin(), E = Map.end(); I != E; ++I)
- cerr << " " << (++i) << ". " << I->second << " "
- << I->second->getDescription() << endl;
+ for (typename MapTy::const_iterator I = Map.begin(), E = Map.end();
+ I != E; ++I)
+ std::cerr << " " << (++i) << ". " << (void*)I->second.get() << " "
+ << *I->second.get() << "\n";
#endif
}
virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
assert(OldTy == NewTy || OldTy->isAbstract());
- if (OldTy == NewTy) {
- if (!OldTy->isAbstract())
- typeBecameConcrete(OldTy);
- // MUST fall through here to update map, even if the type pointers stay
- // the same!
- }
+
+ if (!OldTy->isAbstract())
+ typeBecameConcrete(OldTy);
+
TypeMap<ValType, TypeClass> &Table = MyTable; // Copy MyTable reference
ValType Tmp(*(ValType*)this); // Copy this.
- PATypeHandle<TypeClass> OldType(Table.get(*(ValType*)this), this);
+ PATypeHandle OldType(Table.get(*(ValType*)this), this);
Table.remove(*(ValType*)this); // Destroy's this!
-#if 0
+
// Refine temporary to new state...
- Tmp.doRefinement(OldTy, NewTy);
+ if (OldTy != NewTy)
+ Tmp.doRefinement(OldTy, NewTy);
+ // FIXME: when types are not const!
Table.add((ValType&)Tmp, (TypeClass*)OldType.get());
-#endif
}
void dump() const {
- cerr << "ValTypeBase instance!\n";
+ 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<Type> RetTy;
- vector<PATypeHandle<Type> > ArgTypes;
+ PATypeHandle RetTy;
+ std::vector<PATypeHandle> ArgTypes;
bool isVarArg;
public:
- FunctionValType(const Type *ret, const vector<const Type*> &args,
+ 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) {
for (unsigned i = 0; i < args.size(); ++i)
- ArgTypes.push_back(PATypeHandle<Type>(args[i], this));
+ ArgTypes.push_back(PATypeHandle(args[i], this));
}
// We *MUST* have an explicit copy ctor so that the TypeHandles think that
isVarArg(MVT.isVarArg) {
ArgTypes.reserve(MVT.ArgTypes.size());
for (unsigned i = 0; i < MVT.ArgTypes.size(); ++i)
- ArgTypes.push_back(PATypeHandle<Type>(MVT.ArgTypes[i], this));
+ ArgTypes.push_back(PATypeHandle(MVT.ArgTypes[i], this));
}
+ static FunctionValType get(const FunctionType *FT);
+
// Subclass should override this... to update self as usual
virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
if (RetTy == OldType) RetTy = NewType;
- for (unsigned i = 0; i < ArgTypes.size(); ++i)
+ for (unsigned i = 0, e = ArgTypes.size(); i != e; ++i)
if (ArgTypes[i] == OldType) ArgTypes[i] = NewType;
}
// 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.push_back(FT->getParamType(i));
+ return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg(),
+ FunctionTypes);
+}
+
+
// FunctionType::get - The factory function for the FunctionType class...
FunctionType *FunctionType::get(const Type *ReturnType,
- const vector<const Type*> &Params,
+ const std::vector<const Type*> &Params,
bool isVarArg) {
FunctionValType VT(ReturnType, Params, isVarArg, FunctionTypes);
FunctionType *MT = FunctionTypes.get(VT);
FunctionTypes.add(VT, MT = new FunctionType(ReturnType, Params, isVarArg));
#ifdef DEBUG_MERGE_TYPES
- cerr << "Derived new type: " << MT << endl;
+ std::cerr << "Derived new type: " << MT << "\n";
#endif
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<Type> ValTy;
+ PATypeHandle ValTy;
unsigned Size;
public:
ArrayValType(const Type *val, int sz, TypeMap<ArrayValType, ArrayType> &Tab)
: ValTypeBase<ArrayValType, ArrayType>(AVT), ValTy(AVT.ValTy, this),
Size(AVT.Size) {}
+ static ArrayValType get(const ArrayType *AT);
+
+
// Subclass should override this... to update self as usual
virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
- if (ValTy == OldType) ValTy = NewType;
+ assert(ValTy == OldType);
+ ValTy = NewType;
}
virtual void typeBecameConcrete(const DerivedType *Ty) {
static TypeMap<ArrayValType, ArrayType> ArrayTypes;
+ArrayValType ArrayValType::get(const ArrayType *AT) {
+ return ArrayValType(AT->getElementType(), AT->getNumElements(), ArrayTypes);
+}
+
+
ArrayType *ArrayType::get(const Type *ElementType, unsigned NumElements) {
assert(ElementType && "Can't get array of null types!");
ArrayTypes.add(AVT, AT = new ArrayType(ElementType, NumElements));
#ifdef DEBUG_MERGE_TYPES
- cerr << "Derived new type: " << AT->getDescription() << endl;
+ std::cerr << "Derived new type: " << *AT << "\n";
#endif
return AT;
}
+void ArrayType::dropAllTypeUses(bool inMap) {
+#if 0
+ if (inMap) ArrayTypes.remove(ArrayTypes.getEntryForType(this));
+#endif
+ ElementType = OpaqueType::get();
+}
+
+
+
+
//===----------------------------------------------------------------------===//
// Struct Type Factory...
//
// StructValType - Define a class to hold the key that goes into the TypeMap
//
class StructValType : public ValTypeBase<StructValType, StructType> {
- vector<PATypeHandle<Type> > ElTypes;
+ std::vector<PATypeHandle> ElTypes;
public:
- StructValType(const vector<const Type*> &args,
+ 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<Type>(args[i], this));
+ ElTypes.push_back(PATypeHandle(args[i], this));
}
// We *MUST* have an explicit copy ctor so that the TypeHandles think that
: ValTypeBase<StructValType, StructType>(SVT){
ElTypes.reserve(SVT.ElTypes.size());
for (unsigned i = 0, e = SVT.ElTypes.size(); i != e; ++i)
- ElTypes.push_back(PATypeHandle<Type>(SVT.ElTypes[i], this));
+ ElTypes.push_back(PATypeHandle(SVT.ElTypes[i], this));
}
+ static StructValType get(const StructType *ST);
+
// Subclass should override this... to update self as usual
virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
for (unsigned i = 0; i < ElTypes.size(); ++i)
}
virtual void typeBecameConcrete(const DerivedType *Ty) {
- for (unsigned i = 0; i < ElTypes.size(); ++i)
- if (ElTypes[i] == Ty) ElTypes[i].removeUserFromConcrete();
+ for (unsigned i = 0, e = ElTypes.size(); i != e; ++i)
+ if (ElTypes[i] == Ty)
+ ElTypes[i].removeUserFromConcrete();
}
inline bool operator<(const StructValType &STV) const {
static TypeMap<StructValType, StructType> StructTypes;
-StructType *StructType::get(const vector<const Type*> &ETypes) {
+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);
+}
+
+
+
+StructType *StructType::get(const std::vector<const Type*> &ETypes) {
StructValType STV(ETypes, StructTypes);
StructType *ST = StructTypes.get(STV);
if (ST) return ST;
StructTypes.add(STV, ST = new StructType(ETypes));
#ifdef DEBUG_MERGE_TYPES
- cerr << "Derived new type: " << ST->getDescription() << endl;
+ std::cerr << "Derived new type: " << *ST << "\n";
#endif
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));
+}
+
+
+
//===----------------------------------------------------------------------===//
// Pointer Type Factory...
//
// PointerValType - Define a class to hold the key that goes into the TypeMap
//
class PointerValType : public ValTypeBase<PointerValType, PointerType> {
- PATypeHandle<Type> ValTy;
+ PATypeHandle ValTy;
public:
PointerValType(const Type *val, TypeMap<PointerValType, PointerType> &Tab)
: ValTypeBase<PointerValType, PointerType>(Tab), ValTy(val, this) {}
PointerValType(const PointerValType &PVT)
: ValTypeBase<PointerValType, PointerType>(PVT), ValTy(PVT.ValTy, this) {}
+ static PointerValType get(const PointerType *PT);
+
// Subclass should override this... to update self as usual
virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
- if (ValTy == OldType) ValTy = NewType;
+ assert(ValTy == OldType);
+ ValTy = NewType;
}
virtual void typeBecameConcrete(const DerivedType *Ty) {
static TypeMap<PointerValType, PointerType> PointerTypes;
+PointerValType PointerValType::get(const PointerType *PT) {
+ return PointerValType(PT->getElementType(), PointerTypes);
+}
+
+
PointerType *PointerType::get(const Type *ValueType) {
assert(ValueType && "Can't get a pointer to <null> type!");
PointerValType PVT(ValueType, PointerTypes);
PointerTypes.add(PVT, PT = new PointerType(ValueType));
#ifdef DEBUG_MERGE_TYPES
- cerr << "Derived new type: " << PT->getDescription() << endl;
+ std::cerr << "Derived new type: " << *PT << "\n";
#endif
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();
+}
//===----------------------------------------------------------------------===//
//
void DerivedType::addAbstractTypeUser(AbstractTypeUser *U) const {
assert(isAbstract() && "addAbstractTypeUser: Current type not abstract!");
- if (U == (AbstractTypeUser*)0x2568a8) {
- cerr << "Found bad guy!\n";
- }
#if DEBUG_MERGE_TYPES
- cerr << " addAbstractTypeUser[" << (void*)this << ", " << getDescription()
- << "][" << AbstractTypeUsers.size() << "] User = " << U << endl;
+ std::cerr << " addAbstractTypeUser[" << (void*)this << ", "
+ << *this << "][" << AbstractTypeUsers.size()
+ << "] User = " << U << "\n";
#endif
AbstractTypeUsers.push_back(U);
}
AbstractTypeUsers.erase(AbstractTypeUsers.begin()+i);
#ifdef DEBUG_MERGE_TYPES
- cerr << " remAbstractTypeUser[" << (void*)this << ", "
- << getDescription() << "][" << i << "] User = " << U << endl;
+ std::cerr << " remAbstractTypeUser[" << (void*)this << ", "
+ << *this << "][" << i << "] User = " << U << "\n";
#endif
if (AbstractTypeUsers.empty() && isAbstract()) {
#ifdef DEBUG_MERGE_TYPES
- cerr << "DELETEing unused abstract type: <" << getDescription()
- << ">[" << (void*)this << "]" << endl;
+ std::cerr << "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
-// 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.
+// 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.
//
-void DerivedType::refineAbstractTypeTo(const Type *NewType) {
+void DerivedType::refineAbstractTypeToInternal(const Type *NewType, bool inMap){
assert(isAbstract() && "refineAbstractTypeTo: Current type is not abstract!");
assert(this != NewType && "Can't refine to myself!");
+
+ // The descriptions may be out of date. Conservatively clear them all!
+ AbstractTypeDescriptions.clear();
#ifdef DEBUG_MERGE_TYPES
- cerr << "REFINING abstract type [" << (void*)this << " " << getDescription()
- << "] to [" << (void*)NewType << " " << NewType->getDescription()
- << "]!\n";
+ std::cerr << "REFINING abstract type [" << (void*)this << " "
+ << *this << "] to [" << (void*)NewType << " "
+ << *NewType << "]!\n";
#endif
//
addAbstractTypeUser(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;
if (User == this) {
// Move self use to the start of the list. Increment NSU.
- swap(AbstractTypeUsers.back(), AbstractTypeUsers[NumSelfUses++]);
+ std::swap(AbstractTypeUsers.back(), AbstractTypeUsers[NumSelfUses++]);
} else {
unsigned OldSize = AbstractTypeUsers.size();
#ifdef DEBUG_MERGE_TYPES
- cerr << " REFINING user " << OldSize-1 << "[" << (void*)User
- << "] of abstract type ["
- << (void*)this << " " << getDescription() << "] to ["
- << (void*)NewTy.get() << " " << NewTy->getDescription() << "]!\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);
if (AbstractTypeUsers.size() == OldSize) {
User->refineAbstractType(this, NewTy);
if (AbstractTypeUsers.back() != User)
- cerr << "User changed!\n";
- cerr << "Top of user list is:\n";
+ std::cerr << "User changed!\n";
+ std::cerr << "Top of user list is:\n";
AbstractTypeUsers.back()->dump();
- cerr <<"\nOld User=\n";
+ std::cerr <<"\nOld User=\n";
User->dump();
}
#endif
//
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);
}
++isRefining;
#ifdef DEBUG_MERGE_TYPES
- cerr << "typeIsREFINED type: " << (void*)this <<" "<<getDescription() << "\n";
+ std::cerr << "typeIsREFINED type: " << (void*)this << " " << *this << "\n";
#endif
- for (unsigned i = 0; i < AbstractTypeUsers.size(); ) {
- AbstractTypeUser *ATU = AbstractTypeUsers[i];
+
+ // 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!
+
#ifdef DEBUG_MERGE_TYPES
- cerr << " typeIsREFINED user " << i << "[" << ATU << "] of abstract type ["
- << (void*)this << " " << getDescription() << "]\n";
+ std::cerr << " typeIsREFINED user " << i << "[" << ATU
+ << "] of abstract type [" << (void*)this << " "
+ << *this << "]\n";
#endif
- unsigned OldSize = AbstractTypeUsers.size();
ATU->refineAbstractType(this, this);
-
- // If the user didn't remove itself from the list, continue...
- if (AbstractTypeUsers.size() == OldSize && AbstractTypeUsers[i] == ATU)
- ++i;
}
--isRefining;
for (unsigned i = 0; i < AbstractTypeUsers.size(); ++i) {
if (AbstractTypeUsers[i] != this) {
// Debugging hook
- cerr << "FOUND FAILURE\nUser: ";
+ std::cerr << "FOUND FAILURE\nUser: ";
AbstractTypeUsers[i]->dump();
- cerr << "\nCatch:\n";
+ std::cerr << "\nCatch:\n";
AbstractTypeUsers[i]->refineAbstractType(this, this);
assert(0 && "Type became concrete,"
" but it still has abstract type users hanging around!");
//
void FunctionType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
+ assert((isAbstract() || !OldType->isAbstract()) &&
+ "Refining a non-abstract type!");
#ifdef DEBUG_MERGE_TYPES
- cerr << "FunctionTy::refineAbstractTy(" << (void*)OldType << "["
- << OldType->getDescription() << "], " << (void*)NewType << " ["
- << NewType->getDescription() << "])\n";
+ std::cerr << "FunctionTy::refineAbstractTy(" << (void*)OldType << "["
+ << *OldType << "], " << (void*)NewType << " ["
+ << *NewType << "])\n";
#endif
- // Find the type element we are refining...
- PATypeHandle<Type> *MatchTy = 0;
- if (ResultType == OldType)
- MatchTy = &ResultType;
- else {
- unsigned i;
- for (i = 0; ParamTys[i] != OldType; ++i)
- assert(i != ParamTys.size());
- MatchTy = &ParamTys[i];
- }
- if (!OldType->isAbstract())
- MatchTy->removeUserFromConcrete();
+ // Look up our current type map entry..
+#if 0
+ TypeMap<FunctionValType, FunctionType>::iterator TMI =
+ FunctionTypes.getEntryForType(this);
+#endif
- *MatchTy = NewType;
- const FunctionType *MT = FunctionTypes.containsEquivalent(this);
- if (MT && MT != this) {
- refineAbstractTypeTo(MT); // Different type altogether...
- } else {
- setDerivedTypeProperties(); // Update the name and isAbstract
- typeIsRefined(); // Same type, different contents...
+ // 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);
}
//
void ArrayType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
+ assert((isAbstract() || !OldType->isAbstract()) &&
+ "Refining a non-abstract type!");
#ifdef DEBUG_MERGE_TYPES
- cerr << "ArrayTy::refineAbstractTy(" << (void*)OldType << "["
- << OldType->getDescription() << "], " << (void*)NewType << " ["
- << NewType->getDescription() << "])\n";
+ std::cerr << "ArrayTy::refineAbstractTy(" << (void*)OldType << "["
+ << *OldType << "], " << (void*)NewType << " ["
+ << *NewType << "])\n";
#endif
- if (!OldType->isAbstract()) {
- assert(getElementType() == OldType);
- ElementType.removeUserFromConcrete();
- }
+#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;
- const ArrayType *AT = ArrayTypes.containsEquivalent(this);
- if (AT && AT != this) {
- refineAbstractTypeTo(AT); // Different type altogether...
- } else {
- setDerivedTypeProperties(); // Update the name and isAbstract
- typeIsRefined(); // Same type, different contents...
- }
+
+ ArrayTypes.finishRefinement(this);
}
//
void StructType::refineAbstractType(const DerivedType *OldType,
const Type *NewType) {
+ assert((isAbstract() || !OldType->isAbstract()) &&
+ "Refining a non-abstract type!");
#ifdef DEBUG_MERGE_TYPES
- cerr << "StructTy::refineAbstractTy(" << (void*)OldType << "["
- << OldType->getDescription() << "], " << (void*)NewType << " ["
- << NewType->getDescription() << "])\n";
+ std::cerr << "StructTy::refineAbstractTy(" << (void*)OldType << "["
+ << *OldType << "], " << (void*)NewType << " ["
+ << *NewType << "])\n";
#endif
- unsigned i;
- for (i = 0; ETypes[i] != OldType; ++i)
- assert(i != ETypes.size() && "OldType not found in this structure!");
- if (!OldType->isAbstract())
- ETypes[i].removeUserFromConcrete();
+#if 0
+ // Look up our current type map entry..
+ TypeMap<StructValType, StructType>::iterator TMI =
+ StructTypes.getEntryForType(this);
+#endif
- // Update old type to new type in the array...
- ETypes[i] = NewType;
+ for (int i = ETypes.size()-1; i >= 0; --i)
+ if (ETypes[i] == OldType) {
+ ETypes[i].removeUserFromConcrete();
- const StructType *ST = StructTypes.containsEquivalent(this);
- if (ST && ST != this) {
- refineAbstractTypeTo(ST); // Different type altogether...
- } else {
- setDerivedTypeProperties(); // Update the name and isAbstract
- typeIsRefined(); // Same type, different contents...
- }
+ // Update old type to new type in the array...
+ ETypes[i] = NewType;
+ }
+
+ StructTypes.finishRefinement(this);
}
// 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
- cerr << "PointerTy::refineAbstractTy(" << (void*)OldType << "["
- << OldType->getDescription() << "], " << (void*)NewType << " ["
- << NewType->getDescription() << "])\n";
+ std::cerr << "PointerTy::refineAbstractTy(" << (void*)OldType << "["
+ << *OldType << "], " << (void*)NewType << " ["
+ << *NewType << "])\n";
#endif
- if (!OldType->isAbstract()) {
- assert(ElementType == OldType);
- ElementType.removeUserFromConcrete();
- }
+#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;
- const PointerType *PT = PointerTypes.containsEquivalent(this);
- if (PT && PT != this) {
- refineAbstractTypeTo(PT); // Different type altogether...
- } else {
- setDerivedTypeProperties(); // Update the name and isAbstract
- typeIsRefined(); // Same type, different contents...
- }
+ PointerTypes.finishRefinement(this);
}
projects / oota-llvm.git / blobdiff