mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-09-07 01:54:50 +00:00
Delete MDNodes when LLVMContext is destroyed. Previous attempts: r97918, r97788.
Tested: clang debug bootstrap, llvm-gcc bootstrap, `make check-lit` after configuring with --with-llvmgccdir (and this did run the FrontendC* tests this time) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98410 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
815baebe1c
commit
6f555ca2cd
@ -110,9 +110,6 @@ class MDNode : public Value, public FoldingSetNode {
|
||||
/// node with T.
|
||||
void replaceOperand(MDNodeOperand *Op, Value *NewVal);
|
||||
~MDNode();
|
||||
/// replaceAllOperandsWithNull - This is used while destroying llvm context to
|
||||
/// gracefully delete all nodes. This method replaces all operands with null.
|
||||
void replaceAllOperandsWithNull();
|
||||
|
||||
protected:
|
||||
explicit MDNode(LLVMContext &C, Value *const *Vals, unsigned NumVals,
|
||||
@ -168,9 +165,7 @@ private:
|
||||
bool isNotUniqued() const {
|
||||
return (getSubclassDataFromValue() & NotUniquedBit) != 0;
|
||||
}
|
||||
void setIsNotUniqued() {
|
||||
setValueSubclassData(getSubclassDataFromValue() | NotUniquedBit);
|
||||
}
|
||||
void setIsNotUniqued();
|
||||
|
||||
// Shadow Value::setValueSubclassData with a private forwarding method so that
|
||||
// any future subclasses cannot accidentally use it.
|
||||
|
@ -105,6 +105,11 @@ public:
|
||||
StringMap<MDString*> MDStringCache;
|
||||
|
||||
FoldingSet<MDNode> MDNodeSet;
|
||||
// MDNodes may be uniqued or not uniqued. When they're not uniqued, they
|
||||
// aren't in the MDNodeSet, but they're still shared between objects, so no
|
||||
// one object can destroy them. This set allows us to at least destroy them
|
||||
// on Context destruction.
|
||||
SmallPtrSet<MDNode*, 1> NonUniquedMDNodes;
|
||||
|
||||
ConstantUniqueMap<char, Type, ConstantAggregateZero> AggZeroConstants;
|
||||
|
||||
@ -235,17 +240,21 @@ public:
|
||||
(*I)->AbstractTypeUsers.clear();
|
||||
delete *I;
|
||||
}
|
||||
// Destroy MDNode operands first.
|
||||
// Destroy MDNodes. ~MDNode can move and remove nodes between the MDNodeSet
|
||||
// and the NonUniquedMDNodes sets, so copy the values out first.
|
||||
SmallVector<MDNode*, 8> MDNodes;
|
||||
MDNodes.reserve(MDNodeSet.size() + NonUniquedMDNodes.size());
|
||||
for (FoldingSetIterator<MDNode> I = MDNodeSet.begin(), E = MDNodeSet.end();
|
||||
I != E;) {
|
||||
MDNode *N = &(*I);
|
||||
++I;
|
||||
N->replaceAllOperandsWithNull();
|
||||
I != E; ++I) {
|
||||
MDNodes.push_back(&*I);
|
||||
}
|
||||
while (!MDNodeSet.empty()) {
|
||||
MDNode *N = &(*MDNodeSet.begin());
|
||||
N->destroy();
|
||||
MDNodes.append(NonUniquedMDNodes.begin(), NonUniquedMDNodes.end());
|
||||
for (SmallVector<MDNode*, 8>::iterator I = MDNodes.begin(),
|
||||
E = MDNodes.end(); I != E; ++I) {
|
||||
(*I)->destroy();
|
||||
}
|
||||
assert(MDNodeSet.empty() && NonUniquedMDNodes.empty() &&
|
||||
"Destroying all MDNodes didn't empty the Context's sets.");
|
||||
// Destroy MDStrings.
|
||||
for (StringMap<MDString*>::iterator I = MDStringCache.begin(),
|
||||
E = MDStringCache.end(); I != E; ++I) {
|
||||
|
@ -101,8 +101,10 @@ MDNode::MDNode(LLVMContext &C, Value *const *Vals, unsigned NumVals,
|
||||
MDNode::~MDNode() {
|
||||
assert((getSubclassDataFromValue() & DestroyFlag) != 0 &&
|
||||
"Not being destroyed through destroy()?");
|
||||
if (!isNotUniqued()) {
|
||||
LLVMContextImpl *pImpl = getType()->getContext().pImpl;
|
||||
LLVMContextImpl *pImpl = getType()->getContext().pImpl;
|
||||
if (isNotUniqued()) {
|
||||
pImpl->NonUniquedMDNodes.erase(this);
|
||||
} else {
|
||||
pImpl->MDNodeSet.RemoveNode(this);
|
||||
}
|
||||
|
||||
@ -248,12 +250,10 @@ void MDNode::Profile(FoldingSetNodeID &ID) const {
|
||||
ID.AddPointer(getOperand(i));
|
||||
}
|
||||
|
||||
// replaceAllOperandsWithNull - This is used while destroying llvm context to
|
||||
// gracefully delete all nodes. This method replaces all operands with null.
|
||||
void MDNode::replaceAllOperandsWithNull() {
|
||||
for (MDNodeOperand *Op = getOperandPtr(this, 0), *E = Op+NumOperands;
|
||||
Op != E; ++Op)
|
||||
replaceOperand(Op, 0);
|
||||
void MDNode::setIsNotUniqued() {
|
||||
setValueSubclassData(getSubclassDataFromValue() | NotUniquedBit);
|
||||
LLVMContextImpl *pImpl = getType()->getContext().pImpl;
|
||||
pImpl->NonUniquedMDNodes.insert(this);
|
||||
}
|
||||
|
||||
// Replace value from this node's operand list.
|
||||
|
Loading…
Reference in New Issue
Block a user