maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename removeAllMetadata to clearMetadataHashEntries and simplify 

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

llvm-svn: 108948
This commit is contained in:
Dan Gohman 2010-07-20 22:25:04 +00:00
parent d3f3a89425
commit 48a995f7e9
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/Instruction.h
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.

4
llvm/lib/VMCore/Instruction.cpp
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();
} }

14
llvm/lib/VMCore/Metadata.cpp
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);
}
} }