<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jun 6, 2016 at 4:28 PM, Reid Kleckner 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: rnk<br>
Date: Mon Jun  6 18:28:03 2016<br>
New Revision: 271958<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=271958&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=271958&view=rev</a><br>
Log:<br>
Attempt to work around lack of std::map::emplace in libstdc++4.7<br>
<br>
Modified:<br>
    llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp<br>
<br>
Modified: llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp?rev=271958&r1=271957&r2=271958&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp?rev=271958&r1=271957&r2=271958&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp (original)<br>
+++ llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp Mon Jun  6 18:28:03 2016<br>
@@ -325,7 +325,8 @@ LLVMSymbolizer::getOrCreateObject(const<br>
   if (I == BinaryForPath.end()) {<br>
     Expected<OwningBinary<Binary>> BinOrErr = createBinary(Path);<br>
     if (!BinOrErr) {<br>
-      BinaryForPath.emplace(Path, OwningBinary<Binary>());<br>
+      OwningBinary<Binary> NullBinary;<br>
+      BinaryForPath.insert(std::make_pair(Path, std::move(NullBinary)));<br></blockquote><div><br></div><div>I'm curious - why the introduction of the named variable (NullBinary)? did that work around some particular problem?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
       return BinOrErr.takeError();<br>
     }<br>
     Bin = BinOrErr->getBinary();<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>