-//===-- Type.cpp - Implement the Type class ----------------------*- C++ -*--=//
+//===-- 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 <iostream>
+#include <algorithm>
-using std::vector;
-using std::string;
-using std::map;
-using std::swap;
-using std::make_pair;
-using std::cerr;
+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
-
//===----------------------------------------------------------------------===//
// Type Class Implementation
//===----------------------------------------------------------------------===//
static unsigned CurUID = 0;
-static vector<const Type *> UIDMappings;
-
-void PATypeHolder::dump() const {
- cerr << "PATypeHolder(" << (void*)this << ")\n";
-}
-
-Type::Type(const string &name, PrimitiveID id)
- : Value(Type::TypeTy, Value::TypeVal) {
- setDescription(name);
+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;
+
+Type::Type(const std::string &name, PrimitiveID id)
+ : Value(Type::TypeTy, Value::TypeVal), ForwardType(0) {
+ 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::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 ||
- Ty->getPrimitiveID() == Type::PointerTyID;
+ 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 primitive
+// type. These are fixed by LLVM and are not target dependent. This will
+// return zero if the type does not have a size or is not a primitive type.
+//
+unsigned Type::getPrimitiveSize() const {
+ switch (getPrimitiveID()) {
+#define HANDLE_PRIM_TYPE(TY,SIZE) case TY##TyID: return SIZE;
+#include "llvm/Type.def"
+ default: return 0;
+ }
+}
+
+
+/// 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.
+//
+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;
//===----------------------------------------------------------------------===//
-// Auxilliary classes
+// Auxiliary classes
//===----------------------------------------------------------------------===//
//
// 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
}
+// getAlwaysOpaqueTy - This function returns an opaque type. It doesn't matter
+// _which_ opaque type it is, but the opaque type must never get resolved.
+//
+static Type *getAlwaysOpaqueTy() {
+ static Type *AlwaysOpaqueTy = OpaqueType::get();
+ static PATypeHolder Holder(AlwaysOpaqueTy);
+ return AlwaysOpaqueTy;
+}
//===----------------------------------------------------------------------===//
-// 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.
+// dropAllTypeUses methods - These methods eliminate any possibly recursive type
+// references from a derived type. The type must remain abstract, so we make
+// sure to use an always opaque type as an argument.
//
-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...
- }
- }
- return Result;
+void FunctionType::dropAllTypeUses() {
+ ResultType = getAlwaysOpaqueTy();
+ ParamTys.clear();
}
+void ArrayType::dropAllTypeUses() {
+ ElementType = getAlwaysOpaqueTy();
+}
+
+void StructType::dropAllTypeUses() {
+ ETypes.clear();
+ ETypes.push_back(PATypeHandle(getAlwaysOpaqueTy(), this));
+}
+
+void PointerType::dropAllTypeUses() {
+ ElementType = getAlwaysOpaqueTy();
+}
+
+
-// 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.
+
+// 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.
//
-void DerivedType::setDerivedTypeProperties() {
- vector<const Type *> TypeStack;
- bool isAbstract = false, isRecursive = false;
+bool Type::isTypeAbstract() {
+ if (!isAbstract()) // Base case for the recursion
+ return false; // Primitive = leaf type
- setDescription(getTypeProps(this, TypeStack, isAbstract, isRecursive));
- setAbstract(isAbstract);
- setRecursive(isRecursive);
+ 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!
+ }
+
+ // 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
+ return false; // Two unequal opaque types are never equal
- 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(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 method 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())
- return false;
- } else if (const FunctionType *MTy = dyn_cast<FunctionType>(Ty)) {
- if (MTy->isVarArg() != cast<const FunctionType>(Ty2)->isVarArg())
+ // and that function types can be varargs or not. Consider this now.
+ //
+ 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::ElementTypes &STyE = STy->getElementTypes();
+ const StructType::ElementTypes &STyE2 =
+ cast<StructType>(Ty2)->getElementTypes();
+ if (STyE.size() != STyE2.size()) return false;
+ for (unsigned i = 0, e = STyE.size(); i != e; ++i)
+ if (!TypesEqual(STyE[i], STyE2[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)) {
+ const FunctionType *FTy2 = cast<FunctionType>(Ty2);
+ if (FTy->isVarArg() != FTy2->isVarArg() ||
+ FTy->getParamTypes().size() != FTy2->getParamTypes().size() ||
+ !TypesEqual(FTy->getReturnType(), FTy2->getReturnType(), EqTypes))
return false;
+ const FunctionType::ParamTypes &FTyP = FTy->getParamTypes();
+ const FunctionType::ParamTypes &FTy2P = FTy2->getParamTypes();
+ for (unsigned i = 0, e = FTyP.size(); i != e; ++i)
+ if (!TypesEqual(FTyP[i], FTy2P[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) {
- map<const Type *, const Type *> EqTypes;
+ std::map<const Type *, const Type *> EqTypes;
return TypesEqual(Ty, Ty2, EqTypes);
}
// created on any given run of the compiler... note that this involves updating
// our map if an abstract type gets refined somehow...
//
+namespace llvm {
template<class ValType, class TypeClass>
-class TypeMap : public AbstractTypeUser {
- typedef map<ValType, PATypeHandle<TypeClass> > MapTy;
+class TypeMap {
+ typedef std::map<ValType, TypeClass *> 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() ? I->second : 0;
}
inline void add(const ValType &V, TypeClass *T) {
- Map.insert(make_pair(V, PATypeHandle<TypeClass>(T, this)));
+ Map.insert(std::make_pair(V, T));
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(I->second == Ty && "Type entry wrong?");
+ return I;
}
- // 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) {
- 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();
+
+ void finishRefinement(iterator TyIt) {
+ TypeClass *Ty = TyIt->second;
+
+ // The old record is now out-of-date, because one of the children has been
+ // updated. Remove the obsolete entry from the map.
+ Map.erase(TyIt);
+
+ // Determine whether there is a cycle through the type graph which passes
+ // back through this type. Other cycles are ok,
+ bool HasTypeCycle = false;
+ {
+ std::set<const Type*> VisitedTypes;
+ for (Type::subtype_iterator I = Ty->subtype_begin(),
+ E = Ty->subtype_end(); I != E; ++I) {
+ for (df_ext_iterator<const Type *, std::set<const Type*> >
+ DFI = df_ext_begin(*I, VisitedTypes),
+ E = df_ext_end(*I, VisitedTypes); DFI != E; ++DFI)
+ if (*DFI == Ty) {
+ HasTypeCycle = true;
+ goto FoundCycle;
+ }
}
- return;
}
-#ifdef DEBUG_MERGE_TYPES
- cerr << "Removing Old type from Tab: " << (void*)OldTy << ", "
- << OldTy->getDescription() << " replacement == " << (void*)NewTy
- << ", " << NewTy->getDescription() << endl;
-#endif
- for (MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
- if (I->second == OldTy) {
- Map.erase(I);
- print("refineAbstractType after");
- return;
+ FoundCycle:
+
+ ValType Key = ValType::get(Ty);
+
+ // If there are no cycles going through this node, we can do a simple,
+ // efficient lookup in the map, instead of an inefficient nasty linear
+ // lookup.
+ if (!HasTypeCycle) {
+ iterator I = Map.find(Key);
+ 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 = I->second;
+
+ // Refined to a different type altogether?
+ Ty->refineAbstractTypeTo(NewTy);
+ return;
}
- assert(0 && "Abstract type not found in table!");
- }
+
+ } 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.
+ //
+ for (iterator I = Map.begin(), E = Map.end(); I != E; ++I)
+ if (TypesEqual(Ty, I->second)) {
+ assert(Ty->isAbstract() && "Replacing a non-abstract type?");
+ TypeClass *NewTy = I->second;
+
+ // Refined to a different type altogether?
+ Ty->refineAbstractTypeTo(NewTy);
+ return;
+ }
+ }
+ // If there is no existing type of the same structure, we reinsert an
+ // updated record into the map.
+ Map.insert(std::make_pair(Key, Ty));
+
+ // If the type is currently thought to be abstract, rescan all of our
+ // subtypes to see if the type has just become concrete!
+ if (Ty->isAbstract()) {
+ Ty->setAbstract(Ty->isTypeAbstract());
+
+ // If the type just became concrete, notify all users!
+ if (!Ty->isAbstract())
+ Ty->notifyUsesThatTypeBecameConcrete();
+ }
+ }
+
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 << " "
+ << *I->second << "\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) {
- if (OldTy == NewTy) {
- if (!OldTy->isAbstract())
- typeBecameConcrete(OldTy);
- return;
- }
- TypeMap<ValType, TypeClass> &Table = MyTable; // Copy MyTable reference
- ValType Tmp(*(ValType*)this); // Copy this.
- PATypeHandle<TypeClass> OldType(Table.get(*(ValType*)this), this);
- Table.remove(*(ValType*)this); // Destroy's this!
-#if 1
- // Refine temporary to new state...
- Tmp.doRefinement(OldTy, NewTy);
-
- Table.add((ValType&)Tmp, (TypeClass*)OldType.get());
-#endif
- }
-
- void dump() const {
- 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;
+namespace llvm {
+class FunctionValType {
+ const Type *RetTy;
+ std::vector<const Type*> ArgTypes;
bool isVarArg;
public:
- FunctionValType(const Type *ret, const vector<const Type*> &args,
- bool IVA, TypeMap<FunctionValType, FunctionType> &Tab)
- : ValTypeBase<FunctionValType, FunctionType>(Tab), RetTy(ret, this),
- isVarArg(IVA) {
+ FunctionValType(const Type *ret, const std::vector<const Type*> &args,
+ bool IVA) : RetTy(ret), isVarArg(IVA) {
for (unsigned i = 0; i < args.size(); ++i)
- ArgTypes.push_back(PATypeHandle<Type>(args[i], this));
+ ArgTypes.push_back(args[i]);
}
- // 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<Type>(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) {
+ 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;
}
- 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.push_back(FT->getParamType(i));
+ return FunctionValType(FT->getReturnType(), ParamTypes, FT->isVarArg());
+}
+
+
// 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);
+ FunctionValType VT(ReturnType, Params, isVarArg);
FunctionType *MT = FunctionTypes.get(VT);
if (MT) return MT;
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;
}
//===----------------------------------------------------------------------===//
// Array Type Factory...
//
-class ArrayValType : public ValTypeBase<ArrayValType, ArrayType> {
- PATypeHandle<Type> 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) {}
- // Subclass should override this... to update self as usual
- virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
- if (ValTy == OldType) ValTy = NewType;
+ static ArrayValType get(const ArrayType *AT) {
+ return ArrayValType(AT->getElementType(), AT->getNumElements());
}
- virtual void typeBecameConcrete(const DerivedType *Ty) {
- assert(ValTy == Ty &&
- "Contained type became concrete but we're not using it!");
- ValTy.removeUserFromConcrete();
+ // Subclass should override this... to update self as usual
+ void doRefinement(const DerivedType *OldType, const Type *NewType) {
+ assert(ValTy == OldType);
+ ValTy = NewType;
}
inline bool operator<(const 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;
+
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!
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;
}
// Struct Type Factory...
//
+namespace llvm {
// StructValType - Define a class to hold the key that goes into the TypeMap
//
-class StructValType : public ValTypeBase<StructValType, StructType> {
- vector<PATypeHandle<Type> > ElTypes;
+class StructValType {
+ std::vector<const Type*> ElTypes;
public:
- StructValType(const vector<const Type*> &args,
- TypeMap<StructValType, StructType> &Tab)
- : ValTypeBase<StructValType, StructType>(Tab) {
- for (unsigned i = 0; i < args.size(); ++i)
- ElTypes.push_back(PATypeHandle<Type>(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; i < SVT.ElTypes.size(); ++i)
- ElTypes.push_back(PATypeHandle<Type>(SVT.ElTypes[i], this));
+ static 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);
}
// 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; i < ElTypes.size(); ++i)
- if (ElTypes[i] == Ty) ElTypes[i].removeUserFromConcrete();
- }
-
inline bool operator<(const StructValType &STV) const {
return ElTypes < STV.ElTypes;
}
};
+}
static TypeMap<StructValType, StructType> StructTypes;
-StructType *StructType::get(const vector<const Type*> &ETypes) {
- StructValType STV(ETypes, StructTypes);
+StructType *StructType::get(const std::vector<const Type*> &ETypes) {
+ StructValType STV(ETypes);
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;
}
+
+
//===----------------------------------------------------------------------===//
// 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;
+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) {}
-
- // Subclass should override this... to update self as usual
- virtual void doRefinement(const DerivedType *OldType, const Type *NewType) {
- if (ValTy == OldType) ValTy = NewType;
+ static PointerValType get(const PointerType *PT) {
+ return PointerValType(PT->getElementType());
}
- virtual void typeBecameConcrete(const DerivedType *Ty) {
- assert(ValTy == Ty &&
- "Contained type became concrete but we're not using it!");
- ValTy.removeUserFromConcrete();
+ // Subclass should override this... to update self as usual
+ void doRefinement(const DerivedType *OldType, const Type *NewType) {
+ assert(ValTy == OldType);
+ ValTy = NewType;
}
- inline bool operator<(const PointerValType &MTV) const {
- return ValTy.get() < MTV.ValTy.get();
+ bool operator<(const PointerValType &MTV) const {
+ return ValTy < MTV.ValTy;
}
};
+}
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;
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;
}
-
+namespace llvm {
+void debug_type_tables() {
+ FunctionTypes.dump();
+ ArrayTypes.dump();
+ StructTypes.dump();
+ PointerTypes.dump();
+}
+}
//===----------------------------------------------------------------------===//
// Derived Type Refinement Functions
// 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
// front. Also, it is likely that there will be a stack like behavior to
// users that register and unregister users.
//
- for (unsigned i = AbstractTypeUsers.size(); i > 0; --i) {
- if (AbstractTypeUsers[i-1] == U) {
- AbstractTypeUsers.erase(AbstractTypeUsers.begin()+i-1);
+ unsigned i;
+ for (i = AbstractTypeUsers.size(); AbstractTypeUsers[i-1] != U; --i)
+ assert(i != 0 && "AbstractTypeUser not in user list!");
+
+ --i; // Convert to be in range 0 <= i < size()
+ assert(i < AbstractTypeUsers.size() && "Index out of range!"); // Wraparound?
+
+ AbstractTypeUsers.erase(AbstractTypeUsers.begin()+i);
#ifdef DEBUG_MERGE_TYPES
- cerr << " removeAbstractTypeUser<" << (void*)this << ", "
- << getDescription() << ">[" << i << "] User = " << U << endl;
+ std::cerr << " remAbstractTypeUser[" << (void*)this << ", "
+ << *this << "][" << i << "] User = " << U << "\n";
#endif
-
- if (AbstractTypeUsers.empty() && isAbstract()) {
+
+ if (AbstractTypeUsers.empty() && RefCount == 0 && 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!
- }
- return;
- }
+ delete this; // No users of this abstract type!
}
- assert(0 && "AbstractTypeUser not in user list!");
}
// 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.
+// 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) {
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();
#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
-
// 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);
- // Count the number of self uses. Stop looping when sizeof(list) == NSU.
- unsigned NumSelfUses = 0;
+ // 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();
// Iterate over all of the uses of this type, invoking callback. Each user
- // should remove itself from our use list automatically.
+ // should remove itself from our use list automatically. We have to check to
+ // make sure that NewTy doesn't _become_ 'this'. If it does, resolving types
+ // will not cause users to drop off of the use list. If we resolve to ourself
+ // we succeed!
//
- while (AbstractTypeUsers.size() > NumSelfUses) {
+ while (!AbstractTypeUsers.empty() && NewTy != this) {
AbstractTypeUser *User = AbstractTypeUsers.back();
- if (User == this) {
- // Move self use to the start of the list. Increment NSU.
- swap(AbstractTypeUsers.back(), AbstractTypeUsers[NumSelfUses++]);
- } else {
- unsigned OldSize = AbstractTypeUsers.size();
+ unsigned OldSize = AbstractTypeUsers.size();
#ifdef DEBUG_MERGE_TYPES
- cerr << " REFINING user " << OldSize-1 << " 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);
+ User->refineAbstractType(this, NewTy);
- if (AbstractTypeUsers.size() == OldSize)
- User->refineAbstractType(this, NewTy);
-
- 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(AbstractTypeUsers.back() == this && "Only self uses should be left!");
- 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;
-
-#ifdef DEBUG_MERGE_TYPES
- cerr << "typeIsREFINED type: " << (void*)this <<" "<<getDescription() << endl;
-#endif
- for (unsigned i = 0; i < AbstractTypeUsers.size(); ) {
- AbstractTypeUser *ATU = AbstractTypeUsers[i];
+void DerivedType::notifyUsesThatTypeBecameConcrete() {
#ifdef DEBUG_MERGE_TYPES
- cerr << " typeIsREFINED user " << i << " of abstract type ["
- << (void*)this << " " << getDescription() << "]\n";
+ std::cerr << "typeIsREFINED type: " << (void*)this << " " << *this << "\n";
#endif
- ATU->refineAbstractType(this, this);
-
- // If the user didn't remove itself from the list, continue...
- if (AbstractTypeUsers.size() > i && AbstractTypeUsers[i] == ATU) {
- ++i;
- }
- }
- --isRefining;
-
-#ifndef _NDEBUG
- if (!(isAbstract() || AbstractTypeUsers.empty()))
- for (unsigned i = 0; i < AbstractTypeUsers.size(); ++i) {
- if (AbstractTypeUsers[i] != this) {
- // Debugging hook
- cerr << "FOUND FAILURE\n";
- AbstractTypeUsers[i]->refineAbstractType(this, this);
- assert(0 && "Type became concrete,"
- " but it still has abstract type users hanging around!");
- }
+ unsigned OldSize = AbstractTypeUsers.size();
+ while (!AbstractTypeUsers.empty()) {
+ AbstractTypeUser *ATU = AbstractTypeUsers.back();
+ ATU->typeBecameConcrete(this);
+
+ 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
- cerr << "FunctionTy::refineAbstractTy(" << (void*)OldType << "["
- << OldType->getDescription() << "], " << (void*)NewType << " ["
- << NewType->getDescription() << "])\n";
+ std::cerr << "FunctionTy::refineAbstractTy(" << (void*)OldType << "["
+ << *OldType << "], " << (void*)NewType << " ["
+ << *NewType << "])\n";
#endif
- if (!OldType->isAbstract()) {
- if (ResultType == OldType) ResultType.removeUserFromConcrete();
- for (unsigned i = 0; i < ParamTys.size(); ++i)
- if (ParamTys[i] == OldType) ParamTys[i].removeUserFromConcrete();
- }
-
- if (OldType != NewType) {
- if (ResultType == OldType) ResultType = NewType;
+ // Look up our current type map entry..
+ TypeMap<FunctionValType, FunctionType>::iterator TMI =
+ FunctionTypes.getEntryForType(this);
- for (unsigned i = 0; i < ParamTys.size(); ++i)
- if (ParamTys[i] == OldType) ParamTys[i] = NewType;
+ // 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;
+ }
- 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...
- }
+ FunctionTypes.finishRefinement(TMI);
+}
+
+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
- 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();
- }
+ // Look up our current type map entry..
+ TypeMap<ArrayValType, ArrayType>::iterator TMI =
+ ArrayTypes.getEntryForType(this);
+ 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(TMI);
+}
+
+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
- cerr << "StructTy::refineAbstractTy(" << (void*)OldType << "["
- << OldType->getDescription() << "], " << (void*)NewType << " ["
- << NewType->getDescription() << "])\n";
+ std::cerr << "StructTy::refineAbstractTy(" << (void*)OldType << "["
+ << *OldType << "], " << (void*)NewType << " ["
+ << *NewType << "])\n";
#endif
- if (!OldType->isAbstract()) {
- for (unsigned i = 0; i < ETypes.size(); ++i)
- if (ETypes[i] == OldType)
- ETypes[i].removeUserFromConcrete();
- }
- if (OldType != NewType) {
- // Update old type to new type in the array...
- for (unsigned i = 0; i < ETypes.size(); ++i)
- if (ETypes[i] == OldType)
- ETypes[i] = NewType;
- }
+ // Look up our current type map entry..
+ TypeMap<StructValType, StructType>::iterator TMI =
+ StructTypes.getEntryForType(this);
- 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...
- }
+ 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(TMI);
+}
+
+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
- 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();
- }
+ // Look up our current type map entry..
+ TypeMap<PointerValType, PointerType>::iterator TMI =
+ PointerTypes.getEntryForType(this);
+ 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(TMI);
}
+void PointerType::typeBecameConcrete(const DerivedType *AbsTy) {
+ refineAbstractType(AbsTy, AbsTy);
+}
projects / oota-llvm.git / blobdiff