<div dir="ltr"><br><br><div class="gmail_quote"><div dir="ltr">On Thu, Apr 12, 2018 at 12:57 PM Lang Hames via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: lhames<br>
Date: Thu Apr 12 12:54:41 2018<br>
New Revision: 329944<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=329944&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=329944&view=rev</a><br>
Log:<br>
[ORC] Use insert rather than emplace.<br>
<br>
Hopefully this will fix the build failure at<br>
<a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/9028" rel="noreferrer" target="_blank">http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/9028</a><br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h<br>
    llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h?rev=329944&r1=329943&r2=329944&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h?rev=329944&r1=329943&r2=329944&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h (original)<br>
+++ llvm/trunk/include/llvm/ExecutionEngine/Orc/Core.h Thu Apr 12 12:54:41 2018<br>
@@ -352,8 +352,8 @@ private:<br>
     SymbolTableEntry(JITSymbolFlags SymbolFlags,<br>
                      UnmaterializedInfoIterator UnmaterializedInfoItr);<br>
     SymbolTableEntry(JITEvaluatedSymbol Sym);<br>
-    //     SymbolTableEntry(SymbolTableEntry &&Other);<br>
-    //     SymbolTableEntry &operator=(SymbolTableEntry &&Other);<br>
+    SymbolTableEntry(SymbolTableEntry &&Other);<br>
+    SymbolTableEntry &operator=(SymbolTableEntry &&Other);<br>
     ~SymbolTableEntry();<br>
<br>
     // Change definition due to override. Only usable prior to materialization.<br>
<br>
Modified: llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp?rev=329944&r1=329943&r2=329944&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp?rev=329944&r1=329943&r2=329944&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp (original)<br>
+++ llvm/trunk/lib/ExecutionEngine/Orc/Core.cpp Thu Apr 12 12:54:41 2018<br>
@@ -178,24 +178,24 @@ VSO::SymbolTableEntry::SymbolTableEntry(<br>
          "This constructor is for final symbols only");<br>
 }<br>
<br>
-// VSO::SymbolTableEntry::SymbolTableEntry(SymbolTableEntry &&Other)<br>
-//     : Flags(Other.Flags), Address(0) {<br>
-//   if (this->Flags.isLazy())<br>
-//     UMII = std::move(Other.UMII);<br>
-//   else<br>
-//     Address = Other.Address;<br>
-// }<br>
-<br>
-// VSO::SymbolTableEntry &VSO::SymbolTableEntry::<br>
-// operator=(SymbolTableEntry &&Other) {<br>
-//   destroy();<br>
-//   Flags = std::move(Other.Flags);<br>
-//   if (Other.Flags.isLazy()) {<br>
-//     UMII = std::move(Other.UMII);<br>
-//   } else<br>
-//     Address = Other.Address;<br>
-//   return *this;<br>
-// }<br>
+VSO::SymbolTableEntry::SymbolTableEntry(SymbolTableEntry &&Other)<br>
+    : Flags(Other.Flags), Address(0) {<br>
+  if (this->Flags.isLazy())<br>
+    UMII = std::move(Other.UMII);<br>
+  else<br>
+    Address = Other.Address;<br>
+}<br>
+<br>
+VSO::SymbolTableEntry &VSO::SymbolTableEntry::<br>
+operator=(SymbolTableEntry &&Other) {<br>
+  destroy();<br>
+  Flags = std::move(Other.Flags);<br>
+  if (Other.Flags.isLazy()) {<br>
+    UMII = std::move(Other.UMII);<br>
+  } else<br></blockquote><div><br>^ strangely asymmetric (braces on the if, no braces on the else - both one liners)?<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+    Address = Other.Address;<br>
+  return *this;<br>
+}<br>
<br>
 VSO::SymbolTableEntry::~SymbolTableEntry() { destroy(); }<br>
<br>
@@ -364,7 +364,7 @@ Error VSO::defineLazy(std::unique_ptr<Ma<br>
     if (I != Symbols.end())<br>
       I->second.replaceWith(*this, KV.first, KV.second, UMII);<br>
     else<br>
-      Symbols.emplace(<br>
+      Symbols.insert(<br>
           std::make_pair(KV.first, SymbolTableEntry(KV.second, UMII)));<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></div></div>