FWIW I'd rather we not store the Twine in the class...<div><br></div><div>-eric<br><br><div class="gmail_quote">On Thu Oct 30 2014 at 12:01:57 PM Diego Novillo <<a href="mailto:dnovillo@google.com">dnovillo@google.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dnovillo<br>
Date: Thu Oct 30 13:48:41 2014<br>
New Revision: 220918<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=220918&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=220918&view=rev</a><br>
Log:<br>
Fix Twine corruption problem with diagnostics.<br>
<br>
This fixes the autobuilders I broke with a recent patch. Thanks echristo<br>
and dblaikie for beating me with a clue stick.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Transforms/<u></u>Scalar/SampleProfile.cpp<br>
<br>
Modified: llvm/trunk/lib/Transforms/<u></u>Scalar/SampleProfile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SampleProfile.cpp?rev=220918&r1=220917&r2=220918&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>Transforms/Scalar/<u></u>SampleProfile.cpp?rev=220918&<u></u>r1=220917&r2=220918&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/Transforms/<u></u>Scalar/SampleProfile.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/<u></u>Scalar/SampleProfile.cpp Thu Oct 30 13:48:41 2014<br>
@@ -740,8 +740,7 @@ bool SampleProfileLoader::<u></u>doInitializati<br>
   if (std::error_code EC =<br>
           SampleProfileReader::create(<u></u>Filename, Reader, M.getContext())) {<br>
     std::string Msg = "Could not open profile: " + EC.message();<br>
-    DiagnosticInfoSampleProfile Diag(Filename.data(), Msg);<br>
-    M.getContext().diagnose(Diag);<br>
+    M.getContext().diagnose(<u></u>DiagnosticInfoSampleProfile(<u></u>Filename.data(), Msg));<br>
     return false;<br>
   }<br>
   ProfileIsValid = (Reader->read() == sampleprof_error::success);<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div>