RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 11:42:57 +01:00
Code Issues Projects Releases Wiki Activity

Minor cleanups

Browse Source 
llvm-svn: 8843
This commit is contained in:
Chris Lattner 2003-10-03 18:57:54 +00:00
parent 18c3f42894
commit a2c1509b21
2 changed files with 31 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/llvm/DerivedTypes.h
View File

@ -47,12 +47,8 @@ protected:
// dropAllTypeUses - When this (abstract) type is resolved to be equal to
// another (more concrete) type, we must eliminate all references to other
// types, to avoid some circular reference problems. This also removes the
// type from the internal tables of available types.
virtual void dropAllTypeUses(bool inMap) = 0;
void refineAbstractTypeToInternal(const Type *NewType, bool inMap);
// types, to avoid some circular reference problems.
virtual void dropAllTypeUses() = 0;
public:
@ -82,9 +78,7 @@ public:
// This causes all users of 'this' to switch to reference the more concrete
// type NewType and for 'this' to be deleted.
//
void refineAbstractTypeTo(const Type *NewType) {
refineAbstractTypeToInternal(NewType, true);
}
void refineAbstractTypeTo(const Type *NewType);
void addRef() const {
assert(isAbstract() && "Cannot add a reference to a non-abstract type!");
@ -138,9 +132,8 @@ protected:
// dropAllTypeUses - When this (abstract) type is resolved to be equal to
// another (more concrete) type, we must eliminate all references to other
// types, to avoid some circular reference problems. This also removes the
// type from the internal tables of available types.
virtual void dropAllTypeUses(bool inMap);
// types, to avoid some circular reference problems.
virtual void dropAllTypeUses();
public:
/// FunctionType::get - This static method is the primary way of constructing
@ -235,9 +228,8 @@ protected:
// dropAllTypeUses - When this (abstract) type is resolved to be equal to
// another (more concrete) type, we must eliminate all references to other
// types, to avoid some circular reference problems. This also removes the
// type from the internal tables of available types.
virtual void dropAllTypeUses(bool inMap);
// types, to avoid some circular reference problems.
virtual void dropAllTypeUses();
public:
/// StructType::get - This static method is the primary way to create a
@ -344,9 +336,8 @@ protected:
// dropAllTypeUses - When this (abstract) type is resolved to be equal to
// another (more concrete) type, we must eliminate all references to other
// types, to avoid some circular reference problems. This also removes the
// type from the internal tables of available types.
virtual void dropAllTypeUses(bool inMap);
// types, to avoid some circular reference problems.
virtual void dropAllTypeUses();
public:
/// ArrayType::get - This static method is the primary way to construct an
@ -385,9 +376,8 @@ protected:
// dropAllTypeUses - When this (abstract) type is resolved to be equal to
// another (more concrete) type, we must eliminate all references to other
// types, to avoid some circular reference problems. This also removes the
// type from the internal tables of available types.
virtual void dropAllTypeUses(bool inMap);
// types, to avoid some circular reference problems.
virtual void dropAllTypeUses();
public:
/// PointerType::get - This is the only way to construct a new pointer type.
static PointerType *get(const Type *ElementType);
@ -421,7 +411,9 @@ protected:
// dropAllTypeUses - When this (abstract) type is resolved to be equal to
// another (more concrete) type, we must eliminate all references to other
// types, to avoid some circular reference problems.
virtual void dropAllTypeUses(bool inMap) {} // No type uses
virtual void dropAllTypeUses() {
// FIXME: THIS IS NOT AN ABSTRACT TYPE USER!
} // No type uses
public:
// OpaqueType::get - Static factory method for the OpaqueType class...

48
lib/VMCore/Type.cpp
View File

@ -524,9 +524,8 @@ public:
}
void finishRefinement(TypeClass *Ty, iterator TyIt) {
// FIXME: this could eventually just pass in the iterator!
assert(TyIt->second == Ty && "Did not specify entry for the correct type!");
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.
@ -542,7 +541,7 @@ public:
TypeClass *NewTy = I->second;
// Refined to a different type altogether?
Ty->refineAbstractTypeToInternal(NewTy, false);
Ty->refineAbstractTypeTo(NewTy);
return;
}
@ -662,11 +661,7 @@ FunctionType *FunctionType::get(const Type *ReturnType,
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
void FunctionType::dropAllTypeUses() {
ResultType = OpaqueType::get();
ParamTys.clear();
}
@ -721,10 +716,7 @@ ArrayType *ArrayType::get(const Type *ElementType, unsigned NumElements) {
return AT;
}
void ArrayType::dropAllTypeUses(bool inMap) {
#if 0
if (inMap) ArrayTypes.remove(ArrayTypes.getEntryForType(this));
#endif
void ArrayType::dropAllTypeUses() {
ElementType = OpaqueType::get();
}
@ -781,10 +773,7 @@ StructType *StructType::get(const std::vector<const Type*> &ETypes) {
return ST;
}
void StructType::dropAllTypeUses(bool inMap) {
#if 0
if (inMap) StructTypes.remove(StructTypes.getEntryForType(this));
#endif
void StructType::dropAllTypeUses() {
ETypes.clear();
ETypes.push_back(PATypeHandle(OpaqueType::get(), this));
}
@ -838,10 +827,7 @@ PointerType *PointerType::get(const Type *ValueType) {
return PT;
}
void PointerType::dropAllTypeUses(bool inMap) {
#if 0
if (inMap) PointerTypes.remove(PointerTypes.getEntryForType(this));
#endif
void PointerType::dropAllTypeUses() {
ElementType = OpaqueType::get();
}
@ -891,12 +877,12 @@ void DerivedType::removeAbstractTypeUser(AbstractTypeUser *U) const {
}
// refineAbstractTypeToInternal - This function is used to when it is discovered
// that the 'this' abstract type is actually equivalent to the NewType
// specified. This causes all users of 'this' to switch to reference the more
// concrete type NewType and for 'this' to be deleted.
// refineAbstractTypeTo - This function is used to when it is discovered that
// the 'this' abstract type is actually equivalent to the NewType specified.
// This causes all users of 'this' to switch to reference the more concrete type
// NewType and for 'this' to be deleted.
//
void DerivedType::refineAbstractTypeToInternal(const Type *NewType, bool inMap){
void DerivedType::refineAbstractTypeTo(const Type *NewType) {
assert(isAbstract() && "refineAbstractTypeTo: Current type is not abstract!");
assert(this != NewType && "Can't refine to myself!");
assert(ForwardType == 0 && "This type has already been refined!");
@ -930,7 +916,7 @@ void DerivedType::refineAbstractTypeToInternal(const Type *NewType, bool inMap){
// 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);
dropAllTypeUses();
// Iterate over all of the uses of this type, invoking callback. Each user
// should remove itself from our use list automatically. We have to check to
@ -1010,7 +996,7 @@ void FunctionType::refineAbstractType(const DerivedType *OldType,
ParamTys[i] = NewType;
}
FunctionTypes.finishRefinement(this, TMI);
FunctionTypes.finishRefinement(TMI);
}
void FunctionType::typeBecameConcrete(const DerivedType *AbsTy) {
@ -1040,7 +1026,7 @@ void ArrayType::refineAbstractType(const DerivedType *OldType,
ElementType.removeUserFromConcrete();
ElementType = NewType;
ArrayTypes.finishRefinement(this, TMI);
ArrayTypes.finishRefinement(TMI);
}
void ArrayType::typeBecameConcrete(const DerivedType *AbsTy) {
@ -1074,7 +1060,7 @@ void StructType::refineAbstractType(const DerivedType *OldType,
ETypes[i] = NewType;
}
StructTypes.finishRefinement(this, TMI);
StructTypes.finishRefinement(TMI);
}
void StructType::typeBecameConcrete(const DerivedType *AbsTy) {
@ -1103,7 +1089,7 @@ void PointerType::refineAbstractType(const DerivedType *OldType,
ElementType.removeUserFromConcrete();
ElementType = NewType;
PointerTypes.finishRefinement(this, TMI);
PointerTypes.finishRefinement(TMI);
}
void PointerType::typeBecameConcrete(const DerivedType *AbsTy) {