Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit b86fbcb

Browse files
committed
Simplify destruction of Modules in LLVContextImpl.
This avoids copying the container by simply deleting until empty. While I'd rather move to a stricter ownership semantic (unique_ptr), SmallPtrSet can't cope with unique_ptr and the ownership semantics here are a bit incestuous (Module sort of owns itself, but sort of doesn't (if the LLVMContext is destroyed before the Module, then it deregisters itself from the context... )). Ideally Modules would be given to the context, or possibly an emplace-like function to construct them there. Modules then shouldn't be destroyed by LLVM API clients, but by interacting with the owner (LLVMContext) directly (but even then, passing a Module* to LLVMContext doesn't provide an easy way to destroy the Module, since the set would be over unique_ptrs and you'd need a heterogenous lookup function which SmallPtrSet doesn't have either). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206794 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent bc26ff9 commit b86fbcb

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

lib/IR/LLVMContextImpl.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,11 @@ struct DropFirst {
119119
}
120120

121121
LLVMContextImpl::~LLVMContextImpl() {
122-
// NOTE: We need to delete the contents of OwnedModules, but we have to
123-
// duplicate it into a temporary vector, because the destructor of Module
124-
// will try to remove itself from OwnedModules set. This would cause
125-
// iterator invalidation if we iterated on the set directly.
126-
std::vector<Module*> Modules(OwnedModules.begin(), OwnedModules.end());
127-
DeleteContainerPointers(Modules);
122+
// NOTE: We need to delete the contents of OwnedModules, but Module's dtor
123+
// will call LLVMContextImpl::removeModule, thus invalidating iterators into
124+
// the container. Avoid iterators during this operation:
125+
while (!OwnedModules.empty())
126+
delete *OwnedModules.begin();
128127

129128
// Free the constants. This is important to do here to ensure that they are
130129
// freed before the LeakDetector is torn down.

0 commit comments

Comments
 (0)