From 57c0f206011ce3dff01075c0b38a8c55c19c7fc9 Mon Sep 17 00:00:00 2001 From: Victor Hernandez Date: Wed, 16 Dec 2009 02:52:09 +0000 Subject: [PATCH] MDNodes that refer to an instruction are local to a function; in that case, explicitly keep track of the function they are local to git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91497 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Metadata.h | 10 ++++++++-- lib/VMCore/Metadata.cpp | 11 ++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/llvm/Metadata.h b/include/llvm/Metadata.h index c7f2b445ee8..320944bf244 100644 --- a/include/llvm/Metadata.h +++ b/include/llvm/Metadata.h @@ -111,13 +111,16 @@ class MDNode : public MetadataBase, public FoldingSetNode { ElementVH *Node; unsigned NodeSize; + Function *LocalFunction; protected: - explicit MDNode(LLVMContext &C, Value *const *Vals, unsigned NumVals); + explicit MDNode(LLVMContext &C, Value *const *Vals, unsigned NumVals, + Function *LocalFunction = NULL); public: // Constructors and destructors. static MDNode *get(LLVMContext &Context, - Value *const *Vals, unsigned NumVals); + Value *const *Vals, unsigned NumVals, + Function *LocalFunction = NULL); /// ~MDNode - Destroy MDNode. ~MDNode(); @@ -130,6 +133,9 @@ public: /// getNumElements - Return number of MDNode elements. unsigned getNumElements() const { return NodeSize; } + + /// isFunctionLocal - Return whether MDNode is local to a function. + bool isFunctionLocal() const { return LocalFunction; } /// Profile - calculate a unique identifier for this MDNode to collapse /// duplicates diff --git a/lib/VMCore/Metadata.cpp b/lib/VMCore/Metadata.cpp index b80b6bfebc4..713661680cf 100644 --- a/lib/VMCore/Metadata.cpp +++ b/lib/VMCore/Metadata.cpp @@ -49,13 +49,15 @@ MDString *MDString::get(LLVMContext &Context, const char *Str) { //===----------------------------------------------------------------------===// // MDNode implementation. // -MDNode::MDNode(LLVMContext &C, Value *const *Vals, unsigned NumVals) +MDNode::MDNode(LLVMContext &C, Value *const *Vals, unsigned NumVals, + Function *LocalFunction) : MetadataBase(Type::getMetadataTy(C), Value::MDNodeVal) { NodeSize = NumVals; Node = new ElementVH[NodeSize]; ElementVH *Ptr = Node; for (unsigned i = 0; i != NumVals; ++i) *Ptr++ = ElementVH(Vals[i], this); + LocalFunction = LocalFunction; } void MDNode::Profile(FoldingSetNodeID &ID) const { @@ -63,17 +65,20 @@ void MDNode::Profile(FoldingSetNodeID &ID) const { ID.AddPointer(getElement(i)); } -MDNode *MDNode::get(LLVMContext &Context, Value*const* Vals, unsigned NumVals) { +MDNode *MDNode::get(LLVMContext &Context, Value*const* Vals, unsigned NumVals, + Function *LocalFunction) { LLVMContextImpl *pImpl = Context.pImpl; FoldingSetNodeID ID; for (unsigned i = 0; i != NumVals; ++i) ID.AddPointer(Vals[i]); + if (LocalFunction) + ID.AddPointer(LocalFunction); void *InsertPoint; MDNode *N = pImpl->MDNodeSet.FindNodeOrInsertPos(ID, InsertPoint); if (!N) { // InsertPoint will have been set by the FindNodeOrInsertPos call. - N = new MDNode(Context, Vals, NumVals); + N = new MDNode(Context, Vals, NumVals, LocalFunction); pImpl->MDNodeSet.InsertNode(N, InsertPoint); } return N;