[llvm-branch-commits] [llvm] bf95610 - [ORC] Actually propagate memory unmapping errors on Windows

[Tom Stellard via llvm-branch-commits]

Author: Martin Storsjö
Date: 2022-08-08T12:20:11-07:00
New Revision: bf956104334ac393e92d0655066ea971616a22d8

URL: https://github.com/llvm/llvm-project/commit/bf956104334ac393e92d0655066ea971616a22d8
DIFF: https://github.com/llvm/llvm-project/commit/bf956104334ac393e92d0655066ea971616a22d8.diff

LOG: [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)

Added: 
    

Modified: 
    llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp
index fdfdffca0124..ee92e5191b50 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