[llvm] dad86f5 - [ORC] MapperJITLinkMemoryManager should deinitialize on abandon, not deallocate.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2025-03-31T14:08:42+11:00
New Revision: dad86f5931453ff3d14ba5adb93855ee780298b2

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

LOG: [ORC] MapperJITLinkMemoryManager should deinitialize on abandon, not deallocate.

The JITLinkMemoryManager::InFlightAlloc::abandon method should only abandon
memory for the current allocation, not any other allocations. In
MapperJITLinkMemoryManager this corresponds to the deinitialize operation, not
the deallocate operation (which releases whole slabs of memory that may be
shared by many allocations).

No testcase: This was spotted by inspection. The failing program was linking
concurrently when one linker instance raised an error. Through the call to
abandon an entire underlying slab was deallocated, resulting in segfaults in
other concurrent links that were sharing that slab.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/Orc/MapperJITLinkMemoryManager.cpp b/llvm/lib/ExecutionEngine/Orc/MapperJITLinkMemoryManager.cpp
index 93fe7eeb3ed5b..33734b8253689 100644
--- a/llvm/lib/ExecutionEngine/Orc/MapperJITLinkMemoryManager.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/MapperJITLinkMemoryManager.cpp
@@ -43,7 +43,7 @@ class MapperJITLinkMemoryManager::InFlightAlloc
   }
 
   void abandon(OnAbandonedFunction OnFinalize) override {
-    Parent.Mapper->release({AllocAddr}, std::move(OnFinalize));
+    Parent.Mapper->deinitialize({AllocAddr}, std::move(OnFinalize));
   }
 
 private: