<div dir="ltr">Ow. Looks like I accidentally picked up my version during merge conflict resolution. Let me know if you want to revert back to a shorter variant.</div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Oct 26, 2015 at 2:28 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><span class="">On Mon, Oct 26, 2015 at 2:20 PM, Alexey Samsonov 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: samsonov<br>
Date: Mon Oct 26 16:20:37 2015<br>
New Revision: 251347<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=251347&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=251347&view=rev</a><br>
Log:<br>
Fix build failure on GCC 4.7 (old libstdc++ doesn't have std::map::emplace).<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=251347&r1=251346&r2=251347&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp?rev=251347&r1=251346&r2=251347&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp (original)<br>
+++ llvm/trunk/lib/DebugInfo/Symbolize/Symbolize.cpp Mon Oct 26 16:20:37 2015<br>
@@ -530,7 +530,8 @@ LLVMSymbolizer::getOrCreateModuleInfo(co<br>
<br>
   if (!Objects.first) {<br>
     // Failed to find valid object file.<br>
-    Modules.insert(make_pair(ModuleName, nullptr));<br>
+    Modules.insert(<br>
+        std::make_pair(ModuleName, std::unique_ptr<ModuleInfo>(nullptr)));<br></blockquote><div><br></div></span><div>Any idea if/why this change was necessary ^? (why the need for the std:: qualifier (I guess nullptr is of type std::nullptr_t, so ADL should find make_pair) and the explicit std::unique_ptr construction (std::pair<T, nullptr> should be implicitly convertible to std::pair<T, std::unique_ptr<U>> I think... ))</div><span class=""><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
     return nullptr;<br>
   }<br>
   std::unique_ptr<DIContext> Context;<br>
@@ -549,7 +550,7 @@ LLVMSymbolizer::getOrCreateModuleInfo(co<br>
   assert(Context);<br>
   auto Info = llvm::make_unique<ModuleInfo>(Objects.first, std::move(Context));<br>
   ModuleInfo *Res = Info.get();<br>
-  Modules.emplace(ModuleName, std::move(Info));<br>
+  Modules.insert(std::make_pair(ModuleName, std::move(Info)));<br>
   return Res;<br>
 }<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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></span></div><br></div></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>