//===----------------------------------------------------------------------===//
#include "llvm/DerivedTypes.h"
-#include "llvm/Support/StringExtras.h"
#include "llvm/SymbolTable.h"
-#include "llvm/Support/STLExtras.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;
// 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
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);
ID = id;
- Abstract = false;
+ Abstract = Recursive = false;
UID = CurUID++; // Assign types UID's as they are created
UIDMappings.push_back(this);
}
}
}
+// isLosslesslyConvertableTo - 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 {
+ if (this == Ty) return true;
+ if ((!isPrimitiveType() && !isPointerType()) ||
+ (!Ty->isPointerType() && !Ty->isPrimitiveType())) return false;
+
+ if (getPrimitiveID() == Ty->getPrimitiveID())
+ return true; // Handles identity cast, and cast of differing pointer types
+
+ // Now we know that they are two differing primitive or pointer types
+ switch (getPrimitiveID()) {
+ case Type::UByteTyID: return Ty == Type::SByteTy;
+ case Type::SByteTyID: return Ty == Type::UByteTy;
+ case Type::UShortTyID: return Ty == Type::ShortTy;
+ 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;
+ default:
+ return false; // Other types have no identity values
+ }
+}
+
+
+bool StructType::indexValid(const Value *V) const {
+ if (!isa<Constant>(V)) return false;
+ if (V->getType() != Type::UByteTy) return false;
+ unsigned Idx = cast<ConstantUInt>(V)->getValue();
+ return Idx < ETypes.size();
+}
+
+// getTypeAtIndex - Given an index value into the type, return the type of the
+// element. For a structure type, this must be a constant value...
+//
+const Type *StructType::getTypeAtIndex(const Value *V) const {
+ assert(isa<Constant>(V) && "Structure index must be a constant!!");
+ assert(V->getType() == Type::UByteTy && "Structure index must be ubyte!");
+ unsigned Idx = cast<ConstantUInt>(V)->getValue();
+ assert(Idx < ETypes.size() && "Structure index out of range!");
+ assert(indexValid(V) && "Invalid structure index!"); // Duplicate check
+
+ return ETypes[Idx];
+}
+
+
//===----------------------------------------------------------------------===//
// Auxilliary classes
//===----------------------------------------------------------------------===//
// Derived Type Constructors
//===----------------------------------------------------------------------===//
-MethodType::MethodType(const Type *Result, const vector<const Type*> &Params,
- bool IsVarArgs) : DerivedType("", MethodTyID),
+FunctionType::FunctionType(const Type *Result,
+ const vector<const Type*> &Params,
+ bool IsVarArgs) : DerivedType(FunctionTyID),
ResultType(PATypeHandle<Type>(Result, this)),
isVarArgs(IsVarArgs) {
ParamTys.reserve(Params.size());
- for (unsigned i = 0; i < Params.size()-IsVarArgs; ++i)
+ for (unsigned i = 0; i < Params.size(); ++i)
ParamTys.push_back(PATypeHandle<Type>(Params[i], this));
setDerivedTypeProperties();
}
-ArrayType::ArrayType(const Type *ElType, int NumEl)
- : DerivedType("", ArrayTyID), ElementType(PATypeHandle<Type>(ElType, this)) {
- NumElements = NumEl;
- setDerivedTypeProperties();
-}
-
StructType::StructType(const vector<const Type*> &Types)
- : DerivedType("", StructTyID) {
+ : CompositeType(StructTyID) {
ETypes.reserve(Types.size());
- for (unsigned i = 0; i < Types.size(); ++i)
+ 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));
+ }
setDerivedTypeProperties();
}
-PointerType::PointerType(const Type *E) : DerivedType("", PointerTyID),
- ValueType(PATypeHandle<Type>(E, this)) {
+ArrayType::ArrayType(const Type *ElType, unsigned NumEl)
+ : SequentialType(ArrayTyID, ElType) {
+ NumElements = NumEl;
+ setDerivedTypeProperties();
+}
+
+PointerType::PointerType(const Type *E) : SequentialType(PointerTyID, E) {
setDerivedTypeProperties();
}
-OpaqueType::OpaqueType() : DerivedType("", OpaqueTyID) {
+OpaqueType::OpaqueType() : DerivedType(OpaqueTyID) {
setAbstract(true);
setDescription("opaque"+utostr(getUniqueID()));
#ifdef DEBUG_MERGE_TYPES
TypeStack.push_back(Ty); // Add us to the stack..
switch (Ty->getPrimitiveID()) {
- case Type::MethodTyID: {
- const MethodType *MTy = cast<const MethodType>(Ty);
+ case Type::FunctionTyID: {
+ const FunctionType *MTy = cast<const FunctionType>(Ty);
Result = getTypeProps(MTy->getReturnType(), TypeStack,
isAbstract, isRecursive)+" (";
- for (MethodType::ParamTypes::const_iterator
+ for (FunctionType::ParamTypes::const_iterator
I = MTy->getParamTypes().begin(),
E = MTy->getParamTypes().end(); I != E; ++I) {
if (I != MTy->getParamTypes().begin())
}
case Type::PointerTyID: {
const PointerType *PTy = cast<const PointerType>(Ty);
- Result = getTypeProps(PTy->getValueType(), TypeStack,
+ Result = getTypeProps(PTy->getElementType(), TypeStack,
isAbstract, isRecursive) + " *";
break;
}
case Type::ArrayTyID: {
const ArrayType *ATy = cast<const ArrayType>(Ty);
- int NumElements = ATy->getNumElements();
+ unsigned NumElements = ATy->getNumElements();
Result = "[";
- if (NumElements != -1) Result += itostr(NumElements) + " x ";
+ Result += utostr(NumElements) + " x ";
Result += getTypeProps(ATy->getElementType(), TypeStack,
isAbstract, isRecursive) + "]";
break;
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
- if (Ty != Ty2) {
- map<const Type*, const Type*>::iterator I = EqTypes.find(Ty);
- if (I != EqTypes.end())
- return I->second == Ty2; // Looping back on a type, check for equality
+ 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));
- }
+ // 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();
for (; I != IE && I2 != IE2; ++I, ++I2)
if (!TypesEqual(*I, *I2, EqTypes)) return false;
- // One really annoying special case that breaks an otherwise nice simple
+ // Two really annoying special cases that breaks an otherwise nice simple
// algorithm is the fact that arraytypes have sizes that differentiates types,
- // consider this now.
- if (Ty->isArrayType())
- if (cast<const ArrayType>(Ty)->getNumElements() !=
- cast<const ArrayType>(Ty2)->getNumElements()) return false;
+ // 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())
+ return false;
+ }
return I == IE && I2 == IE2; // Types equal if both iterators are done
}
// corrected.
//
virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy) {
- if (OldTy == NewTy) return;
+ 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
Map.erase(I);
}
- void print(const char *Arg) {
+ void print(const char *Arg) const {
#ifdef DEBUG_MERGE_TYPES
cerr << "TypeMap<>::" << Arg << " table contents:\n";
unsigned i = 0;
- for (MapTy::iterator I = Map.begin(), E = Map.end(); I != E; ++I)
+ for (MapTy::const_iterator I = Map.begin(), E = Map.end(); I != E; ++I)
cerr << " " << (++i) << ". " << I->second << " "
<< I->second->getDescription() << endl;
#endif
}
+
+ void dump() const { print("dump output"); }
};
// 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) return;
+ 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";
}
};
//===----------------------------------------------------------------------===//
-// Method Type Factory and Value Class...
+// Function Type Factory and Value Class...
//
-// MethodValType - Define a class to hold the key that goes into the TypeMap
+// FunctionValType - Define a class to hold the key that goes into the TypeMap
//
-class MethodValType : public ValTypeBase<MethodValType, MethodType> {
+class FunctionValType : public ValTypeBase<FunctionValType, FunctionType> {
PATypeHandle<Type> RetTy;
vector<PATypeHandle<Type> > ArgTypes;
+ bool isVarArg;
public:
- MethodValType(const Type *ret, const vector<const Type*> &args,
- TypeMap<MethodValType, MethodType> &Tab)
- : ValTypeBase<MethodValType, MethodType>(Tab), RetTy(ret, this) {
+ FunctionValType(const Type *ret, const 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));
}
// We *MUST* have an explicit copy ctor so that the TypeHandles think that
- // this MethodValType owns them, not the old one!
+ // this FunctionValType owns them, not the old one!
//
- MethodValType(const MethodValType &MVT)
- : ValTypeBase<MethodValType, MethodType>(MVT), RetTy(MVT.RetTy, this) {
+ 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));
if (ArgTypes[i] == OldType) ArgTypes[i] = NewType;
}
- inline bool operator<(const MethodValType &MTV) const {
- return RetTy.get() < MTV.RetTy.get() ||
- (RetTy.get() == MTV.RetTy.get() && ArgTypes < MTV.ArgTypes);
+ 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 (ArgTypes < MTV.ArgTypes) return true;
+ return (ArgTypes == MTV.ArgTypes) && isVarArg < MTV.isVarArg;
}
};
// Define the actual map itself now...
-static TypeMap<MethodValType, MethodType> MethodTypes;
-
-// MethodType::get - The factory function for the MethodType class...
-MethodType *MethodType::get(const Type *ReturnType,
- const vector<const Type*> &Params) {
- MethodValType VT(ReturnType, Params, MethodTypes);
- MethodType *MT = MethodTypes.get(VT);
+static TypeMap<FunctionValType, FunctionType> FunctionTypes;
+
+// FunctionType::get - The factory function for the FunctionType class...
+FunctionType *FunctionType::get(const Type *ReturnType,
+ const vector<const Type*> &Params,
+ bool isVarArg) {
+ FunctionValType VT(ReturnType, Params, isVarArg, FunctionTypes);
+ FunctionType *MT = FunctionTypes.get(VT);
if (MT) return MT;
- bool IsVarArg = Params.size() && (Params[Params.size()-1] == Type::VoidTy);
- MethodTypes.add(VT, MT = new MethodType(ReturnType, Params, IsVarArg));
+ FunctionTypes.add(VT, MT = new FunctionType(ReturnType, Params, isVarArg));
#ifdef DEBUG_MERGE_TYPES
cerr << "Derived new type: " << MT << endl;
//
class ArrayValType : public ValTypeBase<ArrayValType, ArrayType> {
PATypeHandle<Type> ValTy;
- int Size;
+ unsigned Size;
public:
ArrayValType(const Type *val, int sz, TypeMap<ArrayValType, ArrayType> &Tab)
: ValTypeBase<ArrayValType, ArrayType>(Tab), ValTy(val, this), Size(sz) {}
if (ValTy == OldType) ValTy = NewType;
}
+ virtual void typeBecameConcrete(const DerivedType *Ty) {
+ assert(ValTy == Ty &&
+ "Contained type became concrete but we're not using it!");
+ ValTy.removeUserFromConcrete();
+ }
+
inline bool operator<(const ArrayValType &MTV) const {
if (Size < MTV.Size) return true;
return Size == MTV.Size && ValTy.get() < MTV.ValTy.get();
static TypeMap<ArrayValType, ArrayType> ArrayTypes;
-ArrayType *ArrayType::get(const Type *ElementType, int NumElements = -1) {
+ArrayType *ArrayType::get(const Type *ElementType, unsigned NumElements) {
assert(ElementType && "Can't get array of null types!");
ArrayValType AVT(ElementType, NumElements, ArrayTypes);
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;
}
if (ValTy == OldType) ValTy = NewType;
}
+ virtual void typeBecameConcrete(const DerivedType *Ty) {
+ assert(ValTy == Ty &&
+ "Contained type became concrete but we're not using it!");
+ ValTy.removeUserFromConcrete();
+ }
+
inline bool operator<(const PointerValType &MTV) const {
return ValTy.get() < MTV.ValTy.get();
}
AbstractTypeUsers.erase(AbstractTypeUsers.begin()+i-1);
#ifdef DEBUG_MERGE_TYPES
- cerr << " removeAbstractTypeUser[" << (void*)this << ", "
- << getDescription() << "][" << AbstractTypeUsers.size()
- << "] User = " << U << endl;
+ cerr << " removeAbstractTypeUser<" << (void*)this << ", "
+ << getDescription() << ">[" << i << "] User = " << U << endl;
#endif
- if (AbstractTypeUsers.empty()) {
+ if (AbstractTypeUsers.empty() && isAbstract()) {
#ifdef DEBUG_MERGE_TYPES
- cerr << "DELETEing unused abstract type: " << getDescription()
- << " " << (void*)this << endl;
+ cerr << "DELETEing unused abstract type: <" << getDescription()
+ << ">[" << (void*)this << "]" << endl;
#endif
delete this; // No users of this abstract type!
}
return;
}
}
- assert(isAbstract() && "removeAbstractTypeUser: Type not abstract!");
assert(0 && "AbstractTypeUser not in user list!");
}
// 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<Type> NewTy(NewType);
+ PATypeHolder NewTy(NewType);
// 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,
<< (void*)this << " " << getDescription() << "] to ["
<< (void*)NewTy.get() << " " << NewTy->getDescription() << "]!\n";
#endif
- AbstractTypeUsers.back()->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!");
removeAbstractTypeUser(this);
}
-
// 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.
//
void DerivedType::typeIsRefined() {
assert(isRefining >= 0 && isRefining <= 2 && "isRefining out of bounds!");
- if (isRefining == 2) return; // Kill recursion here...
+ if (isRefining == 1) return; // Kill recursion here...
++isRefining;
#ifdef DEBUG_MERGE_TYPES
ATU->refineAbstractType(this, this);
// If the user didn't remove itself from the list, continue...
- if (AbstractTypeUsers.size() > i && AbstractTypeUsers[i] == ATU)
+ 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!");
+ }
+ }
+#endif
}
// concrete - this could potentially change us from an abstract type to a
// concrete type.
//
-void MethodType::refineAbstractType(const DerivedType *OldType,
- const Type *NewType) {
+void FunctionType::refineAbstractType(const DerivedType *OldType,
+ const Type *NewType) {
#ifdef DEBUG_MERGE_TYPES
- cerr << "MethodTy::refineAbstractTy(" << (void*)OldType << "["
+ cerr << "FunctionTy::refineAbstractTy(" << (void*)OldType << "["
<< OldType->getDescription() << "], " << (void*)NewType << " ["
<< NewType->getDescription() << "])\n";
#endif
- if (OldType == ResultType) {
- ResultType = NewType;
- } else {
- unsigned i;
- for (i = 0; i < ParamTys.size(); ++i)
- if (OldType == ParamTys[i]) {
- ParamTys[i] = NewType;
- break;
- }
- assert(i != ParamTys.size() && "Did not contain oldtype!");
+ 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;
- // Notify everyone that I have changed!
- if (const MethodType *MTy = MethodTypes.containsEquivalent(this)) {
-#ifndef _NDEBUG
- // Calculate accurate name for debugging purposes
- vector<const Type *> TypeStack;
- bool isAbstract = false, isRecursive = false;
- setDescription(getTypeProps(this, TypeStack, isAbstract, isRecursive));
-#endif
+ for (unsigned i = 0; i < ParamTys.size(); ++i)
+ if (ParamTys[i] == OldType) ParamTys[i] = NewType;
+ }
-#ifdef DEBUG_MERGE_TYPES
- cerr << "Type " << (void*)this << " equilivant to existing " << (void*)MTy
- << " - destroying!\n";
-#endif
- refineAbstractTypeTo(MTy); // Different type altogether...
- return;
+ 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...
}
- setDerivedTypeProperties(); // Update the name and isAbstract
- typeIsRefined();
}
<< OldType->getDescription() << "], " << (void*)NewType << " ["
<< NewType->getDescription() << "])\n";
#endif
- assert(OldType == ElementType && "Cannot refine from OldType!");
- ElementType = NewType;
- // Notify everyone that I have changed!
- if (const ArrayType *ATy = ArrayTypes.containsEquivalent(this)) {
-#ifndef _NDEBUG
- // Calculate accurate name for debugging purposes
- vector<const Type *> TypeStack;
- bool isAbstract = false, isRecursive = false;
- setDescription(getTypeProps(this, TypeStack, isAbstract, isRecursive));
-#endif
+ if (!OldType->isAbstract()) {
+ assert(getElementType() == OldType);
+ ElementType.removeUserFromConcrete();
+ }
-#ifdef DEBUG_MERGE_TYPES
- cerr << "Type " << (void*)this << " equilivant to existing " << (void*)ATy
- << " - destroying!\n";
-#endif
- refineAbstractTypeTo(ATy); // Different type altogether...
- return;
+ 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...
}
- setDerivedTypeProperties(); // Update the name and isAbstract
- typeIsRefined(); // Same type, different contents...
}
<< OldType->getDescription() << "], " << (void*)NewType << " ["
<< NewType->getDescription() << "])\n";
#endif
-
- if (OldType != NewType) {
- unsigned i;
- for (i = 0; i < ETypes.size(); ++i)
- if (OldType == ETypes[i]) {
- ETypes[i] = NewType;
- break;
- }
- assert(i != ETypes.size() && "Did not contain oldtype!");
+ if (!OldType->isAbstract()) {
+ for (unsigned i = 0; i < ETypes.size(); ++i)
+ if (ETypes[i] == OldType)
+ ETypes[i].removeUserFromConcrete();
}
- vector<const Type *> ElTypes(
- map_iterator(ETypes.begin(), mem_fun_ref(&PATypeHandle<Type>::get)),
- map_iterator(ETypes.end() , mem_fun_ref(&PATypeHandle<Type>::get)));
-
-
- // Notify everyone that I have changed!
- if (const StructType *STy = StructTypes.containsEquivalent(this)) {
-#ifndef _NDEBUG
- // Calculate accurate name for debugging purposes
- vector<const Type *> TypeStack;
- bool isAbstract = false, isRecursive = false;
- setDescription(getTypeProps(this, TypeStack, isAbstract, isRecursive));
-#endif
-
-#ifdef DEBUG_MERGE_TYPES
- cerr << "Type " << (void*)this << " equilivant to existing " << (void*)STy
- << " - destroying!\n";
-#endif
- refineAbstractTypeTo(STy); // Different type altogether...
- return;
+ 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;
+ }
+
+ 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...
}
- setDerivedTypeProperties(); // Update the name and isAbstract
- typeIsRefined(); // Same type, different contents...
}
// refineAbstractType - Called when a contained type is found to be more
<< OldType->getDescription() << "], " << (void*)NewType << " ["
<< NewType->getDescription() << "])\n";
#endif
- assert(OldType == ValueType && "Cannot refine from OldType!");
- ValueType = NewType;
- // Notify everyone that I have changed!
- if (const PointerType *PTy = PointerTypes.containsEquivalent(this)) {
-#ifndef _NDEBUG
- // Calculate accurate name for debugging purposes
- vector<const Type *> TypeStack;
- bool isAbstract = false, isRecursive = false;
- setDescription(getTypeProps(this, TypeStack, isAbstract, isRecursive));
-#endif
+ if (!OldType->isAbstract()) {
+ assert(ElementType == OldType);
+ ElementType.removeUserFromConcrete();
+ }
-#ifdef DEBUG_MERGE_TYPES
- cerr << "Type " << (void*)this << " equilivant to existing " << (void*)PTy
- << " - destroying!\n";
-#endif
- refineAbstractTypeTo(PTy); // Different type altogether...
- return;
+ 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...
}
- setDerivedTypeProperties(); // Update the name and isAbstract
- typeIsRefined(); // Same type, different contents...
}
projects / oota-llvm.git / blobdiff