<div dir="ltr">Thank you for doing this. This looks much nicer.</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jun 29, 2015 at 4:26 PM, Peter Collingbourne <span dir="ltr"><<a href="mailto:peter@pcc.me.uk" target="_blank">peter@pcc.me.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: pcc<br>
Date: Mon Jun 29 18:26:28 2015<br>
New Revision: 241020<br>
<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D241020-26view-3Drev&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=U9KMPHJyShjbEnQ4E4KSgkqKiGYRfvJzX7AhR1VzIQI&s=aDrwiZFp6K38nappz-WHaAYxI-wsq7Ft_HFcYL3YGZE&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=241020&view=rev</a><br>
Log:<br>
COFF: Use LTOModule::getLinkerOpts() instead of reading the linker directives ourselves.<br>
<br>
Modified:<br>
    lld/trunk/COFF/InputFiles.cpp<br>
<br>
Modified: lld/trunk/COFF/InputFiles.cpp<br>
URL: <a href="https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_lld_trunk_COFF_InputFiles.cpp-3Frev-3D241020-26r1-3D241019-26r2-3D241020-26view-3Ddiff&d=AwMFaQ&c=8hUWFZcy2Z-Za5rBPlktOQ&r=mQ4LZ2PUj9hpadE3cDHZnIdEwhEBrbAstXeMaFoB9tg&m=U9KMPHJyShjbEnQ4E4KSgkqKiGYRfvJzX7AhR1VzIQI&s=480UHeNoWY1A5Hnkxo3M8OkWym0SAOk-hBb0SkZzmIo&e=" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/InputFiles.cpp?rev=241020&r1=241019&r2=241020&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/COFF/InputFiles.cpp (original)<br>
+++ lld/trunk/COFF/InputFiles.cpp Mon Jun 29 18:26:28 2015<br>
@@ -292,33 +292,10 @@ std::error_code BitcodeFile::parse() {<br>
       bool Replaceable = (SymbolDef == LTO_SYMBOL_DEFINITION_TENTATIVE ||<br>
                           (Attrs & LTO_SYMBOL_COMDAT));<br>
       SymbolBodies.push_back(new (Alloc) DefinedBitcode(SymName, Replaceable));<br>
-<br>
-      const llvm::GlobalValue *GV = M->getSymbolGV(I);<br>
-      if (GV && GV->hasDLLExportStorageClass()) {<br>
-        Directives += " /export:";<br>
-        Directives += SymName;<br>
-        if (!GV->getValueType()->isFunctionTy())<br>
-          Directives += ",data";<br>
-      }<br>
-    }<br>
-  }<br>
-<br>
-  // Extract any linker directives from the bitcode file, which are represented<br>
-  // as module flags with the key "Linker Options".<br>
-  llvm::SmallVector<llvm::Module::ModuleFlagEntry, 8> Flags;<br>
-  M->getModule().getModuleFlagsMetadata(Flags);<br>
-  for (auto &&Flag : Flags) {<br>
-    if (Flag.Key->getString() != "Linker Options")<br>
-      continue;<br>
-<br>
-    for (llvm::Metadata *Op : cast<llvm::MDNode>(Flag.Val)->operands()) {<br>
-      for (llvm::Metadata *InnerOp : cast<llvm::MDNode>(Op)->operands()) {<br>
-        Directives += " ";<br>
-        Directives += cast<llvm::MDString>(InnerOp)->getString();<br>
-      }<br>
     }<br>
   }<br>
<br>
+  Directives = M->getLinkerOpts();<br>
   return std::error_code();<br>
 }<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>