From: Lang Hames <lhames@gmail.com>
Date: Mon, 5 Aug 2019 20:30:35 +0000 (+0000)
Subject: [ORC] Work around broken GCC/libstdc++ by adding an explicit conversion.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85303828fbc2f75054b4e212847048b756fafedd;p=llvm

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

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@367921 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/Orc/LLJIT.cpp b/lib/ExecutionEngine/Orc/LLJIT.cpp
index 14b3b6ac7f6..05ebb746985 100644
--- a/lib/ExecutionEngine/Orc/LLJIT.cpp
+++ b/lib/ExecutionEngine/Orc/LLJIT.cpp
@@ -75,7 +75,10 @@ LLJIT::createObjectLinkingLayer(LLJITBuilderState &S, ExecutionSession &ES) {
   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>