diff options
| author | Lang Hames <lhames@gmail.com> | 2019-08-05 20:30:35 +0000 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2019-08-05 20:30:35 +0000 |
| commit | 1707735fa4793df55e68232f756287a2c7e26237 (patch) | |
| tree | ce70415d2b25fa5d50a0c02d51f418c3c6d83836 /llvm/lib/ExecutionEngine/Orc | |
| parent | 5d14efe279b5db9f4746ff834ab5c70e249d3871 (diff) | |
| download | bcm5719-llvm-1707735fa4793df55e68232f756287a2c7e26237.tar.gz bcm5719-llvm-1707735fa4793df55e68232f756287a2c7e26237.zip | |
[ORC] Work around broken GCC/libstdc++ by adding an explicit conversion.
This should fix the bots that have been failing due to r367712.
llvm-svn: 367921
Diffstat (limited to 'llvm/lib/ExecutionEngine/Orc')
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/LLJIT.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp index 14b3b6ac7f6..05ebb746985 100644 --- a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp +++ b/llvm/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> |
