<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Dec 10, 2015 at 8:11 AM, Teresa Johnson via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: tejohnson<br>
Date: Thu Dec 10 10:11:23 2015<br>
New Revision: 255256<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=255256&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=255256&view=rev</a><br>
Log:<br>
[ThinLTO] Release files in gold plugin during combined index (take 2)<br></blockquote><div><br></div><div>Could we use an RAII wrapper to ensure this is more reliably handled?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Ensure we release the files even when they don't hold a function index<br>
summary section, by restructuring the control flow a little bit.<br>
<br>
Modified:<br>
    llvm/trunk/tools/gold/gold-plugin.cpp<br>
<br>
Modified: llvm/trunk/tools/gold/gold-plugin.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=255256&r1=255255&r2=255256&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=255256&r1=255255&r2=255256&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/gold/gold-plugin.cpp (original)<br>
+++ llvm/trunk/tools/gold/gold-plugin.cpp Thu Dec 10 10:11:23 2015<br>
@@ -855,10 +855,8 @@ static ld_plugin_status allSymbolsReadHo<br>
           getFunctionIndexForFile(F, File);<br>
<br>
       // Skip files without a function summary.<br>
-      if (!Index)<br>
-        continue;<br>
-<br>
-      CombinedIndex.mergeFrom(std::move(Index), ++NextModuleId);<br>
+      if (Index)<br>
+        CombinedIndex.mergeFrom(std::move(Index), ++NextModuleId);<br>
<br>
       if (release_input_file(F.handle) != LDPS_OK)<br>
         message(LDPL_FATAL, "Failed to release file information");<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>