From 63686af1e1d1848ccbc3deb87012050922a0c51b Mon Sep 17 00:00:00 2001 From: Vladislav Khmelevsky Date: Tue, 19 Apr 2022 18:48:27 +0300 Subject: [PATCH] [BOLT] Fix build with GCC 7.3.0 The gcc 7.3.0 version raises "could not covert" error without std::move used explicitly. Differential Revision: https://reviews.llvm.org/D124009 --- bolt/lib/Core/BinaryContext.cpp | 2 +- bolt/lib/Rewrite/MachORewriteInstance.cpp | 2 +- bolt/lib/Rewrite/RewriteInstance.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bolt/lib/Core/BinaryContext.cpp b/bolt/lib/Core/BinaryContext.cpp index 64d43ec..251d383 100644 --- a/bolt/lib/Core/BinaryContext.cpp +++ b/bolt/lib/Core/BinaryContext.cpp @@ -251,7 +251,7 @@ BinaryContext::createBinaryContext(const ObjectFile *File, bool IsPIC, BC->HasFixedLoadAddress = !IsPIC; - return BC; + return std::move(BC); } bool BinaryContext::forceSymbolRelocations(StringRef SymbolName) const { diff --git a/bolt/lib/Rewrite/MachORewriteInstance.cpp b/bolt/lib/Rewrite/MachORewriteInstance.cpp index 00fe8cf..0f85eb1 100644 --- a/bolt/lib/Rewrite/MachORewriteInstance.cpp +++ b/bolt/lib/Rewrite/MachORewriteInstance.cpp @@ -91,7 +91,7 @@ MachORewriteInstance::createMachORewriteInstance( std::make_unique(InputFile, ToolPath, Err); if (Err) return std::move(Err); - return MachORI; + return std::move(MachORI); } MachORewriteInstance::MachORewriteInstance(object::MachOObjectFile *InputFile, diff --git a/bolt/lib/Rewrite/RewriteInstance.cpp b/bolt/lib/Rewrite/RewriteInstance.cpp index b6628aa..735090a 100644 --- a/bolt/lib/Rewrite/RewriteInstance.cpp +++ b/bolt/lib/Rewrite/RewriteInstance.cpp @@ -363,7 +363,7 @@ RewriteInstance::createRewriteInstance(ELFObjectFileBase *File, const int Argc, auto RI = std::make_unique(File, Argc, Argv, ToolPath, Err); if (Err) return std::move(Err); - return RI; + return std::move(RI); } RewriteInstance::RewriteInstance(ELFObjectFileBase *File, const int Argc, -- 2.7.4