Replace direct call to orc_rt_elfnix_register_object_sections with AllocActions.

Author: SahilPatidar

compiler-rt/lib/orc/elfnix_platform.cpp

@@ -213,6 +213,14 @@ Error ELFNixPlatformRuntimeState::registerObjectSections(
   return Error::success();
 }
 
+Error ELFNixPlatformRuntimeState::deregisterObjectSections(
+    ELFNixPerObjectSectionsToRegister POSR) {
+  if (POSR.EHFrameSection.Start)
+    deregisterEHFrameSection(POSR.EHFrameSection.Start.toPtr<const char *>());
+
+  return Error::success();
+}
+
 Error ELFNixPlatformRuntimeState::registerJITDylib(std::string &Name, void *Handle) {
   std::lock_guard<std::recursive_mutex> Lock(JDStatesMutex);
 
@@ -297,14 +305,6 @@ Error ELFNixPlatformRuntimeState::deregisterInits(
   return Error::success();
 }
 
-Error ELFNixPlatformRuntimeState::deregisterObjectSections(
-    ELFNixPerObjectSectionsToRegister POSR) {
-  if (POSR.EHFrameSection.Start)
-    deregisterEHFrameSection(POSR.EHFrameSection.Start.toPtr<const char *>());
-
-  return Error::success();
-}
-
 const char *ELFNixPlatformRuntimeState::dlerror() { return DLFcnError.c_str(); }
 
 void *ELFNixPlatformRuntimeState::dlopen(std::string_view Path, int Mode) {

llvm/include/llvm/ExecutionEngine/Orc/ELFNixPlatform.h

@@ -190,7 +190,8 @@ class ELFNixPlatform : public Platform {
   // Records the addresses of runtime symbols used by the platform.
   Error bootstrapELFNixRuntime(JITDylib &PlatformJD);
 
-  Error registerPerObjectSections(const ELFPerObjectSectionsToRegister &POSR);
+  Error registerPerObjectSections(
+      jitlink::LinkGraph &G,const ELFPerObjectSectionsToRegister &POSR);
 
   Expected<uint64_t> createPThreadKey();
 

llvm/lib/ExecutionEngine/Orc/ELFNixPlatform.cpp

@@ -546,7 +546,9 @@ Error ELFNixPlatform::bootstrapELFNixRuntime(JITDylib &PlatformJD) {
   }
 
   for (auto &D : DeferredPOSRs)
-    if (auto Err = registerPerObjectSections(D))
+    if (auto Err = ES.callSPSWrapper<void(
+                    SPSELFPerObjectSectionsToRegister)>(
+         orc_rt_elfnix_register_object_sections, D))
       return Err;
 
   for (auto KV : JDBootstrapStates) {
@@ -563,20 +565,22 @@ Error ELFNixPlatform::bootstrapELFNixRuntime(JITDylib &PlatformJD) {
 }
 
 Error ELFNixPlatform::registerPerObjectSections(
-    const ELFPerObjectSectionsToRegister &POSR) {
+    jitlink::LinkGraph &G, const ELFPerObjectSectionsToRegister &POSR) {
 
   if (!orc_rt_elfnix_register_object_sections)
     return make_error<StringError>("Attempting to register per-object "
                                    "sections, but runtime support has not "
                                    "been loaded yet",
                                    inconvertibleErrorCode());
 
-  Error ErrResult = Error::success();
-  if (auto Err = ES.callSPSWrapper<shared::SPSError(
-                     SPSELFPerObjectSectionsToRegister)>(
-          orc_rt_elfnix_register_object_sections, ErrResult, POSR))
-    return Err;
-  return ErrResult;
+  using SPSRegisterObjSectionsArgs = SPSArgList<SPSELFPerObjectSectionsToRegister>;
+  G.allocActions().push_back(
+        {cantFail(WrapperFunctionCall::Create<SPSRegisterObjSectionsArgs>(
+             orc_rt_elfnix_register_object_sections, POSR)),
+         cantFail(WrapperFunctionCall::Create<SPSRegisterObjSectionsArgs>(
+             orc_rt_elfnix_deregister_object_sections, POSR))});
+
+  return Error::success();
 }
 
 Expected<uint64_t> ELFNixPlatform::createPThreadKey() {
@@ -738,7 +742,7 @@ void ELFNixPlatform::ELFNixPlatformPlugin::addEHAndTLVSupportPasses(
       }
 
       // Otherwise register it immediately.
-      if (auto Err = MP.registerPerObjectSections(POSR))
+      if (auto Err = MP.registerPerObjectSections(G,POSR))
         return Err;
     }