Revert "Re-apply 5acd471, Add a shared-memory based orc::MemoryMapper, with fixes."

This reverts commit 32d8d23.

Reason: Broke the UBSan buildbots. See more details on Phabricator:
https://reviews.llvm.org/D128544

Author: hctim

Diff for: llvm/include/llvm/ExecutionEngine/Orc/MemoryMapper.h

@@ -109,47 +109,6 @@ class InProcessMemoryMapper final : public MemoryMapper {
   AllocationMap Allocations;
 };
 
-class SharedMemoryMapper final : public MemoryMapper {
-public:
-  struct SymbolAddrs {
-    ExecutorAddr Instance;
-    ExecutorAddr Reserve;
-    ExecutorAddr Initialize;
-    ExecutorAddr Deinitialize;
-    ExecutorAddr Release;
-  };
-
-  SharedMemoryMapper(ExecutorProcessControl &EPC, SymbolAddrs SAs)
-      : EPC(EPC), SAs(SAs) {}
-
-  void reserve(size_t NumBytes, OnReservedFunction OnReserved) override;
-
-  char *prepare(ExecutorAddr Addr, size_t ContentSize) override;
-
-  void initialize(AllocInfo &AI, OnInitializedFunction OnInitialized) override;
-
-  void deinitialize(ArrayRef<ExecutorAddr> Allocations,
-                    OnDeinitializedFunction OnDeInitialized) override;
-
-  void release(ArrayRef<ExecutorAddr> Reservations,
-               OnReleasedFunction OnRelease) override;
-
-  ~SharedMemoryMapper() override;
-
-private:
-  struct Reservation {
-    void *LocalAddr;
-    size_t Size;
-  };
-
-  ExecutorProcessControl &EPC;
-  SymbolAddrs SAs;
-
-  std::mutex Mutex;
-
-  std::map<ExecutorAddr, Reservation> Reservations;
-};
-
 } // namespace orc
 } // end namespace llvm
 

Diff for: llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h

@@ -31,12 +31,6 @@ extern const char *SimpleExecutorMemoryManagerReserveWrapperName;
 extern const char *SimpleExecutorMemoryManagerFinalizeWrapperName;
 extern const char *SimpleExecutorMemoryManagerDeallocateWrapperName;
 
-extern const char *ExecutorSharedMemoryMapperServiceInstanceName;
-extern const char *ExecutorSharedMemoryMapperServiceReserveWrapperName;
-extern const char *ExecutorSharedMemoryMapperServiceInitializeWrapperName;
-extern const char *ExecutorSharedMemoryMapperServiceDeinitializeWrapperName;
-extern const char *ExecutorSharedMemoryMapperServiceReleaseWrapperName;
-
 extern const char *MemoryWriteUInt8sWrapperName;
 extern const char *MemoryWriteUInt16sWrapperName;
 extern const char *MemoryWriteUInt32sWrapperName;
@@ -64,21 +58,6 @@ using SPSSimpleExecutorMemoryManagerFinalizeSignature =
 using SPSSimpleExecutorMemoryManagerDeallocateSignature = shared::SPSError(
     shared::SPSExecutorAddr, shared::SPSSequence<shared::SPSExecutorAddr>);
 
-// ExecutorSharedMemoryMapperService
-using SPSExecutorSharedMemoryMapperServiceReserveSignature =
-    shared::SPSExpected<
-        shared::SPSTuple<shared::SPSExecutorAddr, shared::SPSString>>(
-        shared::SPSExecutorAddr, uint64_t);
-using SPSExecutorSharedMemoryMapperServiceInitializeSignature =
-    shared::SPSExpected<shared::SPSExecutorAddr>(shared::SPSExecutorAddr,
-                                                 shared::SPSExecutorAddr,
-                                                 shared::SPSFinalizeRequest);
-using SPSExecutorSharedMemoryMapperServiceDeinitializeSignature =
-    shared::SPSError(shared::SPSExecutorAddr,
-                     shared::SPSSequence<shared::SPSExecutorAddr>);
-using SPSExecutorSharedMemoryMapperServiceReleaseSignature = shared::SPSError(
-    shared::SPSExecutorAddr, shared::SPSSequence<shared::SPSExecutorAddr>);
-
 using SPSRunAsMainSignature = int64_t(shared::SPSExecutorAddr,
                                       shared::SPSSequence<shared::SPSString>);
 

Diff for: llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.h

@@ -1,7 +1,3 @@
-if( CMAKE_HOST_UNIX AND HAVE_LIBRT )
-  set(rt_lib rt)
-endif()
-
 add_llvm_component_library(LLVMOrcJIT
   CompileOnDemandLayer.cpp
   CompileUtils.cpp
@@ -49,7 +45,6 @@ add_llvm_component_library(LLVMOrcJIT
 
   LINK_LIBS
   ${LLVM_PTHREAD_LIB}
-  ${rt_lib}
 
   LINK_COMPONENTS
   Core