[llvm] r367921 - [ORC] Work around broken GCC/libstdc++ by adding an explicit conversion.

[Lang Hames via llvm-commits]

Author: lhames
Date: Mon Aug  5 13:30:35 2019
New Revision: 367921

URL: http://llvm.org/viewvc/llvm-project?rev=367921&view=rev
Log:
[ORC] Work around broken GCC/libstdc++ by adding an explicit conversion.

This should fix the bots that have been failing due to r367712.

Modified:
    llvm/trunk/lib/ExecutionEngine/Orc/LLJIT.cpp

Modified: llvm/trunk/lib/ExecutionEngine/Orc/LLJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Orc/LLJIT.cpp?rev=367921&r1=367920&r2=367921&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Orc/LLJIT.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Orc/LLJIT.cpp Mon Aug  5 13:30:35 2019
@@ -75,7 +75,10 @@ LLJIT::createObjectLinkingLayer(LLJITBui
   if (S.JTMB->getTargetTriple().isOSBinFormatCOFF())
     ObjLinkingLayer->setOverrideObjectFlagsWithResponsibilityFlags(true);
 
-  return ObjLinkingLayer;
+  // FIXME: Explicit conversion to std::unique_ptr<ObjectLayer> added to silence
+  //        errors from some GCC / libstdc++ bots. Remove this conversion (i.e.
+  //        just return ObjLinkingLayer) once those bots are upgraded.
+  return std::unique_ptr<ObjectLayer>(std::move(ObjLinkingLayer));
 }
 
 Expected<IRCompileLayer::CompileFunction>