diff options
author | Devang Patel <dpatel@apple.com> | 2009-08-11 18:01:24 +0000 |
---|---|---|
committer | Devang Patel <dpatel@apple.com> | 2009-08-11 18:01:24 +0000 |
commit | ab67e705f59d567afded845465f358b8a66ab62e (patch) | |
tree | 2b94953480af82399bdce3668793a07896be29be | |
parent | e2574d3215c412a15763d26aee9aa5d856764c2c (diff) | |
download | llvm-ab67e705f59d567afded845465f358b8a66ab62e.tar.gz llvm-ab67e705f59d567afded845465f358b8a66ab62e.tar.bz2 llvm-ab67e705f59d567afded845465f358b8a66ab62e.tar.xz |
Link NamedMDNodes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78696 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/Metadata.h | 2 | ||||
-rw-r--r-- | lib/Linker/LinkModules.cpp | 19 | ||||
-rw-r--r-- | lib/VMCore/Metadata.cpp | 9 | ||||
-rw-r--r-- | test/Linker/linknamedmdnode.ll | 6 | ||||
-rw-r--r-- | test/Linker/linknamedmdnode2.ll | 6 |
5 files changed, 42 insertions, 0 deletions
diff --git a/include/llvm/Metadata.h b/include/llvm/Metadata.h index 3803b5a5f5..8533efddb0 100644 --- a/include/llvm/Metadata.h +++ b/include/llvm/Metadata.h @@ -229,6 +229,8 @@ public: return new NamedMDNode(N, MDs, NumMDs, M); } + static NamedMDNode *Create(const NamedMDNode *NMD, Module *M = 0); + /// eraseFromParent - Drop all references and remove the node from parent /// module. void eraseFromParent(); diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 3aec864c2d..ca0bf73002 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -538,6 +538,22 @@ static bool GetLinkageResult(GlobalValue *Dest, const GlobalValue *Src, return false; } +// Insert all of the named mdnoes in Src into the Dest module. +static void LinkNamedMDNodes(Module *Dest, Module *Src) { + for (Module::const_named_metadata_iterator I = Src->named_metadata_begin(), + E = Src->named_metadata_end(); I != E; ++I) { + const NamedMDNode *SrcNMD = I; + NamedMDNode *DestNMD = Dest->getNamedMetadata(SrcNMD->getName()); + if (!DestNMD) + NamedMDNode::Create(SrcNMD, Dest); + else { + // Add Src elements into Dest node. + for (unsigned i = 0, e = SrcNMD->getNumElements(); i != e; ++i) + DestNMD->addElement(SrcNMD->getElement(i)); + } + } +} + // LinkGlobals - Loop through the global variables in the src module and merge // them into the dest module. static bool LinkGlobals(Module *Dest, const Module *Src, @@ -1307,6 +1323,9 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { AppendingVars.insert(std::make_pair(I->getName(), I)); } + // Insert all of the named mdnoes in Src into the Dest module. + LinkNamedMDNodes(Dest, Src); + // Insert all of the globals in src into the Dest module... without linking // initializers (which could refer to functions not yet mapped over). if (LinkGlobals(Dest, Src, ValueMap, AppendingVars, ErrorMsg)) diff --git a/lib/VMCore/Metadata.cpp b/lib/VMCore/Metadata.cpp index 3a61d0eefb..4762a10555 100644 --- a/lib/VMCore/Metadata.cpp +++ b/lib/VMCore/Metadata.cpp @@ -104,6 +104,7 @@ MDNode::~MDNode() { dropAllReferences(); getType()->getContext().pImpl->MDNodes.remove(this); } + //===----------------------------------------------------------------------===// //NamedMDNode implementation // @@ -123,6 +124,14 @@ NamedMDNode::NamedMDNode(const Twine &N, MetadataBase*const* MDs, ParentModule->getNamedMDList().push_back(this); } +NamedMDNode *NamedMDNode::Create(const NamedMDNode *NMD, Module *M) { + assert (NMD && "Invalid source NamedMDNode!"); + SmallVector<MetadataBase *, 4> Elems; + for (unsigned i = 0, e = NMD->getNumElements(); i != e; ++i) + Elems.push_back(NMD->getElement(i)); + return new NamedMDNode(NMD->getName().data(), Elems.data(), Elems.size(), M); +} + /// eraseFromParent - Drop all references and remove the node from parent /// module. void NamedMDNode::eraseFromParent() { diff --git a/test/Linker/linknamedmdnode.ll b/test/Linker/linknamedmdnode.ll new file mode 100644 index 0000000000..455b3b807f --- /dev/null +++ b/test/Linker/linknamedmdnode.ll @@ -0,0 +1,6 @@ +; RUN: llvm-as < %s > %t.bc +; RUN: llvm-as < %p/linknamedmdnode2.ll > %t2.bc +; RUN: llvm-link %t.bc %t2.bc | llvm-dis | grep "!llvm.stuff = !{!0, !1}" + +!0 = metadata !{i32 42} +!llvm.stuff = !{!0} diff --git a/test/Linker/linknamedmdnode2.ll b/test/Linker/linknamedmdnode2.ll new file mode 100644 index 0000000000..d16f62abed --- /dev/null +++ b/test/Linker/linknamedmdnode2.ll @@ -0,0 +1,6 @@ +; This file is used by linknamedmdnode.ll, so it doesn't actually do anything itself +; +; RUN: true + +!0 = metadata !{i32 41} +!llvm.stuff = !{!0} |