Allow types that have been forwarded to to be freed.
Tested: make check-lit && valgrind --dsymutil=yes --leak-check=full unittests/ExecutionEngine/JIT/Debug/JITTests llvm-svn: 98447
This commit is contained in:
parent
84189ab22b
commit
0374d7feb0
|
|
@ -87,6 +87,11 @@ void Type::destroy() const {
|
||||||
pImpl->OpaqueTypes.erase(opaque_this);
|
pImpl->OpaqueTypes.erase(opaque_this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ForwardType && ForwardType->isAbstract()) {
|
||||||
|
ForwardType->dropRef();
|
||||||
|
ForwardType = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
// For all the other type subclasses, there is either no contained types or
|
// For all the other type subclasses, there is either no contained types or
|
||||||
// just one (all Sequentials). For Sequentials, the PATypeHandle is not
|
// just one (all Sequentials). For Sequentials, the PATypeHandle is not
|
||||||
// allocated past the type object, its included directly in the SequentialType
|
// allocated past the type object, its included directly in the SequentialType
|
||||||
|
|
@ -254,10 +259,12 @@ const Type *Type::getForwardedTypeInternal() const {
|
||||||
// Yes, it is forwarded again. First thing, add the reference to the new
|
// Yes, it is forwarded again. First thing, add the reference to the new
|
||||||
// forward type.
|
// forward type.
|
||||||
if (RealForwardedType->isAbstract())
|
if (RealForwardedType->isAbstract())
|
||||||
cast<DerivedType>(RealForwardedType)->addRef();
|
RealForwardedType->addRef();
|
||||||
|
|
||||||
// Now drop the old reference. This could cause ForwardType to get deleted.
|
// Now drop the old reference. This could cause ForwardType to get deleted.
|
||||||
cast<DerivedType>(ForwardType)->dropRef();
|
// ForwardType must be abstract because only abstract types can have their own
|
||||||
|
// ForwardTypes.
|
||||||
|
ForwardType->dropRef();
|
||||||
|
|
||||||
// Return the updated type.
|
// Return the updated type.
|
||||||
ForwardType = RealForwardedType;
|
ForwardType = RealForwardedType;
|
||||||
|
|
@ -1142,8 +1149,8 @@ void DerivedType::unlockedRefineAbstractTypeTo(const Type *NewType) {
|
||||||
// Any PATypeHolders referring to this type will now automatically forward to
|
// Any PATypeHolders referring to this type will now automatically forward to
|
||||||
// the type we are resolved to.
|
// the type we are resolved to.
|
||||||
ForwardType = NewType;
|
ForwardType = NewType;
|
||||||
if (NewType->isAbstract())
|
if (ForwardType->isAbstract())
|
||||||
cast<DerivedType>(NewType)->addRef();
|
ForwardType->addRef();
|
||||||
|
|
||||||
// Add a self use of the current type so that we don't delete ourself until
|
// Add a self use of the current type so that we don't delete ourself until
|
||||||
// after the function exits.
|
// after the function exits.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue