Rename removeAllMetadata to clearMetadataHashEntries and simplify

it to just do the things that need to be done when an instruction
is deleted.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108948 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2010-07-20 22:25:04 +00:00
parent 7648bd428b
commit 4f1be4abba
3 changed files with 9 additions and 11 deletions

View File

@ -189,7 +189,7 @@ private:
void getAllMetadataImpl(SmallVectorImpl<std::pair<unsigned,MDNode*> > &)const; void getAllMetadataImpl(SmallVectorImpl<std::pair<unsigned,MDNode*> > &)const;
void getAllMetadataOtherThanDebugLocImpl(SmallVectorImpl<std::pair<unsigned, void getAllMetadataOtherThanDebugLocImpl(SmallVectorImpl<std::pair<unsigned,
MDNode*> > &) const; MDNode*> > &) const;
void removeAllMetadata(); void clearMetadataHashEntries();
public: public:
//===--------------------------------------------------------------------===// //===--------------------------------------------------------------------===//
// Predicates and helper methods. // Predicates and helper methods.

View File

@ -49,8 +49,8 @@ Instruction::Instruction(const Type *ty, unsigned it, Use *Ops, unsigned NumOps,
// Out of line virtual method, so the vtable, etc has a home. // Out of line virtual method, so the vtable, etc has a home.
Instruction::~Instruction() { Instruction::~Instruction() {
assert(Parent == 0 && "Instruction still linked in the program!"); assert(Parent == 0 && "Instruction still linked in the program!");
if (hasMetadata()) if (hasMetadataHashEntry())
removeAllMetadata(); clearMetadataHashEntries();
} }

View File

@ -563,13 +563,11 @@ getAllMetadataOtherThanDebugLocImpl(SmallVectorImpl<std::pair<unsigned,
} }
/// removeAllMetadata - Remove all metadata from this instruction. /// clearMetadataHashEntries - Clear all hashtable-based metadata from
void Instruction::removeAllMetadata() { /// this instruction.
assert(hasMetadata() && "Caller should check"); void Instruction::clearMetadataHashEntries() {
DbgLoc = DebugLoc(); assert(hasMetadataHashEntry() && "Caller should check");
if (hasMetadataHashEntry()) { getContext().pImpl->MetadataStore.erase(this);
getContext().pImpl->MetadataStore.erase(this); setHasMetadataHashEntry(false);
setHasMetadataHashEntry(false);
}
} }