diff options
author | Mircea Trofin <mtrofin@google.com> | 2024-05-15 10:34:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-15 10:34:47 -0700 |
commit | 217668f641e82f901645f428ae0d07a3c01e9a8a (patch) | |
tree | d2c428d07a420c27b3b7aea38d6b9be55ac9ea9e /llvm/lib/Object/COFFObjectFile.cpp | |
parent | d92c67784f21063d6334a009dbf4f9e0f8217b41 (diff) | |
download | llvm-217668f641e82f901645f428ae0d07a3c01e9a8a.zip llvm-217668f641e82f901645f428ae0d07a3c01e9a8a.tar.gz llvm-217668f641e82f901645f428ae0d07a3c01e9a8a.tar.bz2 |
[nfc] Allow forwarding `Error` returns from `Expected` callers (#92208)
On a few compilers (clang 11/12 for example [1]), the following does not
result in a copy elision, and since `Error`'s copy dtor is elided,
results in a compile error:
```
Expect<Something> foobar() {
...
if (Error E = aCallReturningError())
return E;
...
}
```
Moving `E` would, conversely, result in the pessimizing-move warning on
more recent clangs ("moving a local object in a return statement
prevents copy elision")
We just need to make the `Expected` ctor taking an `Error` take it as a
r-value reference.
[1] https://lab.llvm.org/buildbot/#/builders/54/builds/10505
Diffstat (limited to 'llvm/lib/Object/COFFObjectFile.cpp')
-rw-r--r-- | llvm/lib/Object/COFFObjectFile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp index 18506f3..5a85b8e0 100644 --- a/llvm/lib/Object/COFFObjectFile.cpp +++ b/llvm/lib/Object/COFFObjectFile.cpp @@ -294,7 +294,7 @@ COFFObjectFile::getSectionContents(DataRefImpl Ref) const { const coff_section *Sec = toSec(Ref); ArrayRef<uint8_t> Res; if (Error E = getSectionContents(Sec, Res)) - return std::move(E); + return E; return Res; } @@ -807,7 +807,7 @@ Expected<std::unique_ptr<COFFObjectFile>> COFFObjectFile::create(MemoryBufferRef Object) { std::unique_ptr<COFFObjectFile> Obj(new COFFObjectFile(std::move(Object))); if (Error E = Obj->initialize()) - return std::move(E); + return E; return std::move(Obj); } @@ -1959,7 +1959,7 @@ ResourceSectionRef::getContents(const coff_resource_data_entry &Entry) { uint64_t Offset = Entry.DataRVA + Sym->getValue(); ArrayRef<uint8_t> Contents; if (Error E = Obj->getSectionContents(*Section, Contents)) - return std::move(E); + return E; if (Offset + Entry.DataSize > Contents.size()) return createStringError(object_error::parse_failed, "data outside of section"); |