diff options
| author | Nico Weber <thakis@chromium.org> | 2020-06-05 17:00:20 -0400 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2020-06-05 17:00:20 -0400 |
| commit | 38f3ba591e3a64fa5bbe684b3171c7bda6c5b527 (patch) | |
| tree | 47432f5326845411dd0ccd181d4cfd1bd626e37c /llvm/lib/Object/XCOFFObjectFile.cpp | |
| parent | ad4e7b9dc82b13d124071f0add09cb541b495a0e (diff) | |
| download | llvm-38f3ba591e3a64fa5bbe684b3171c7bda6c5b527.zip llvm-38f3ba591e3a64fa5bbe684b3171c7bda6c5b527.tar.gz llvm-38f3ba591e3a64fa5bbe684b3171c7bda6c5b527.tar.bz2 | |
Revert "Migrate Binary::checkOffset from error_code to Error, NFC"
This reverts commit 74bd98829d82312676a60c5c2d142e20691b2f13.
Breaks LLVM::section-headers.test everywhere, see e.g.
http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/29940/steps/test-check-all/logs/FAIL%3A%20LLVM%3A%3Asection-headers.test
Diffstat (limited to 'llvm/lib/Object/XCOFFObjectFile.cpp')
| -rw-r--r-- | llvm/lib/Object/XCOFFObjectFile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Object/XCOFFObjectFile.cpp b/llvm/lib/Object/XCOFFObjectFile.cpp index f75291d2..d41afc8 100644 --- a/llvm/lib/Object/XCOFFObjectFile.cpp +++ b/llvm/lib/Object/XCOFFObjectFile.cpp @@ -29,8 +29,8 @@ template <typename T> static Expected<const T *> getObject(MemoryBufferRef M, const void *Ptr, const uint64_t Size = sizeof(T)) { uintptr_t Addr = uintptr_t(Ptr); - if (Error E = Binary::checkOffset(M, Addr, Size)) - return std::move(E); + if (std::error_code EC = Binary::checkOffset(M, Addr, Size)) + return errorCodeToError(EC); return reinterpret_cast<const T *>(Addr); } |