diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2018-08-01 10:12:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 10:12:45 +0200 |
| commit | 61b9a516d3c0495596b21fae10eab0f82c4c7f7f (patch) | |
| tree | 8a7729910e06749af7a4bea4e9370ceba0c55f0a | |
| parent | 9e43ebda534c14885124fbde2915083f43ec1c99 (diff) | |
| parent | 9ccd7eef1eeda8d207f62dae0c32d35cad7fa826 (diff) | |
| download | rust-61b9a516d3c0495596b21fae10eab0f82c4c7f7f.tar.gz rust-61b9a516d3c0495596b21fae10eab0f82c4c7f7f.zip | |
Rollup merge of #52824 - varkor:fix-llvm-ret-move-warnings, r=rkruppe
Fix -Wpessimizing-move warnings in rustllvm/PassWrapper These are producing warnings when building rustc (`warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]`).
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index 3f5550bf95f..a13e4ffa8f8 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -1075,7 +1075,7 @@ LLVMRustPrepareThinLTOImport(const LLVMRustThinLTOData *Data, LLVMModuleRef M) { auto MOrErr = getLazyBitcodeModule(Memory, Context, true, true); if (!MOrErr) - return std::move(MOrErr); + return MOrErr; // The rest of this closure is a workaround for // https://bugs.llvm.org/show_bug.cgi?id=38184 where during ThinLTO imports @@ -1093,14 +1093,14 @@ LLVMRustPrepareThinLTOImport(const LLVMRustThinLTOData *Data, LLVMModuleRef M) { // shouldn't be a perf hit. if (Error Err = (*MOrErr)->materializeMetadata()) { Expected<std::unique_ptr<Module>> Ret(std::move(Err)); - return std::move(Ret); + return Ret; } auto *WasmCustomSections = (*MOrErr)->getNamedMetadata("wasm.custom_sections"); if (WasmCustomSections) WasmCustomSections->eraseFromParent(); - return std::move(MOrErr); + return MOrErr; }; FunctionImporter Importer(Data->Index, Loader); Expected<bool> Result = Importer.importFunctions(Mod, ImportList); |
