<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Feb 13, 2016 at 6:06 AM, Krzysztof Parzyszek 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: kparzysz<br>
Date: Sat Feb 13 08:06:01 2016<br>
New Revision: 260816<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=260816&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=260816&view=rev</a><br>
Log:<br>
[Hexagon] Replace use of "std::map::emplace" with "insert"<br>
<br>
Gcc 4.7.2-4 does not seem to have "emplace" in its implementation of map.<br>
This should fix the build failure on polly-amd64-linux.<br>
<br>
<br>
Modified:<br>
    llvm/trunk/lib/Target/Hexagon/HexagonFrameLowering.cpp<br>
<br>
Modified: llvm/trunk/lib/Target/Hexagon/HexagonFrameLowering.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonFrameLowering.cpp?rev=260816&r1=260815&r2=260816&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonFrameLowering.cpp?rev=260816&r1=260815&r2=260816&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/Hexagon/HexagonFrameLowering.cpp (original)<br>
+++ llvm/trunk/lib/Target/Hexagon/HexagonFrameLowering.cpp Sat Feb 13 08:06:01 2016<br>
@@ -1762,7 +1762,10 @@ void HexagonFrameLowering::optimizeSpill<br>
   // and collect relevant information.<br>
   for (auto &B : MF) {<br>
     std::map<int,IndexType> LastStore, LastLoad;<br>
-    auto P = BlockIndexes.emplace(&B, HexagonBlockRanges::InstrIndexMap(B));<br>
+    // Emplace appears not to be supported in gcc 4.7.2-4.<br>
+    //auto P = BlockIndexes.emplace(&B, HexagonBlockRanges::InstrIndexMap(B));<br>
+    auto TmpP = std::make_pair(&B, HexagonBlockRanges::InstrIndexMap(B));<br></blockquote><div><br></div><div>This would cause the InstrIndexMap to be copied on insertion, if you just roll it inot the insert (or call std::move on the insert) it should be a bit more efficient by being able to move from the InstrIndexMap into the BlockIndexes.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+    auto P = BlockIndexes.insert(TmpP);<br>
     auto &IndexMap = P.first->second;<br>
     DEBUG(dbgs() << "Index map for BB#" << B.getNumber() << "\n"<br>
                  << IndexMap << '\n');<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>