diff options
| author | Martin Storsjö <martin@martin.st> | 2022-08-03 11:04:51 +0300 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-08-08 12:20:11 -0700 |
| commit | bf956104334ac393e92d0655066ea971616a22d8 (patch) | |
| tree | eadfe7acb76a3c7e05aa67ebbf0e523002744eea | |
| parent | 853c8f927a2445169a1e1944ced94577f0a928ed (diff) | |
| download | llvm-bf956104334ac393e92d0655066ea971616a22d8.zip llvm-bf956104334ac393e92d0655066ea971616a22d8.tar.gz llvm-bf956104334ac393e92d0655066ea971616a22d8.tar.bz2 | |
[ORC] Actually propagate memory unmapping errors on Windows
This fixes warnings like these:
../lib/ExecutionEngine/Orc/MemoryMapper.cpp:364:9: warning: ignoring return value of function declared with 'warn_unused_result' attribute [-Wunused-result]
joinErrors(std::move(Err),
^~~~~~~~~~ ~~~~~~~~~~~~~~~
Differential Revision: https://reviews.llvm.org/D131056
(cherry picked from commit 46bc1b5689e417d870c57a8d16044a55549673fa)
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp index fdfdffc..ee92e51 100644 --- a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp +++ b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp @@ -361,8 +361,8 @@ void SharedMemoryMapper::release(ArrayRef<ExecutorAddr> Bases, #elif defined(_WIN32) if (!UnmapViewOfFile(Reservations[Base].LocalAddr)) - joinErrors(std::move(Err), - errorCodeToError(mapWindowsError(GetLastError()))); + Err = joinErrors(std::move(Err), + errorCodeToError(mapWindowsError(GetLastError()))); #endif |