Rename eh-frame registration functions to reflect their new status as actions,

clang-format patch.

Author: Lang Hames

llvm/include/llvm/ExecutionEngine/Orc/EHFrameRegistrationPlugin.h

@@ -28,10 +28,10 @@ class EHFrameRegistrationPlugin : public LinkGraphLinkingLayer::Plugin {
   static Expected<std::unique_ptr<EHFrameRegistrationPlugin>>
   Create(ExecutionSession &ES);
 
-  EHFrameRegistrationPlugin(ExecutionSession &ES, ExecutorAddr RegisterEHFrame,
+  EHFrameRegistrationPlugin(ExecutorAddr RegisterEHFrame,
                             ExecutorAddr DeregisterEHFrame)
-      : ES(ES), RegisterEHFrame(RegisterEHFrame),
-        DeregisterEHFrame(DeregisterEHFrame) {}
+      : RegisterEHFrame(RegisterEHFrame), DeregisterEHFrame(DeregisterEHFrame) {
+  }
 
   void modifyPassConfig(MaterializationResponsibility &MR,
                         jitlink::LinkGraph &G,
@@ -46,7 +46,6 @@ class EHFrameRegistrationPlugin : public LinkGraphLinkingLayer::Plugin {
                                    ResourceKey SrcKey) override {}
 
 private:
-  ExecutionSession &ES;
   ExecutorAddr RegisterEHFrame;
   ExecutorAddr DeregisterEHFrame;
 };

llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h

@@ -44,8 +44,8 @@ extern const char *MemoryWriteUInt64sWrapperName;
 extern const char *MemoryWriteBuffersWrapperName;
 extern const char *MemoryWritePointersWrapperName;
 
-extern const char *RegisterEHFrameSectionWrapperName;
-extern const char *DeregisterEHFrameSectionWrapperName;
+extern const char *RegisterEHFrameSectionAllocActionName;
+extern const char *DeregisterEHFrameSectionAllocActionName;
 
 extern const char *RunAsMainWrapperName;
 extern const char *RunAsVoidFunctionWrapperName;

llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h

@@ -35,9 +35,9 @@ Error deregisterEHFrameSection(const void *EHFrameSectionAddr,
 } // end namespace llvm
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerEHFrameSectionWrapper(const char *Data, uint64_t Size);
+llvm_orc_registerEHFrameSectionAllocAction(const char *Data, uint64_t Size);
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_deregisterEHFrameSectionWrapper(const char *Data, uint64_t Size);
+llvm_orc_deregisterEHFrameSectionAllocAction(const char *Data, uint64_t Size);
 
 #endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_REGISTEREHFRAMES_H

llvm/lib/ExecutionEngine/Orc/EHFrameRegistrationPlugin.cpp

@@ -22,17 +22,17 @@ Expected<std::unique_ptr<EHFrameRegistrationPlugin>>
 EHFrameRegistrationPlugin::Create(ExecutionSession &ES) {
   // Lookup addresseses of the registration/deregistration functions in the
   // bootstrap map.
-  ExecutorAddr RegisterEHFrameSectionWrapper;
-  ExecutorAddr DeregisterEHFrameSectionWrapper;
+  ExecutorAddr RegisterEHFrameSectionAllocAction;
+  ExecutorAddr DeregisterEHFrameSectionAllocAction;
   if (auto Err = ES.getExecutorProcessControl().getBootstrapSymbols(
-          {{RegisterEHFrameSectionWrapper,
-            rt::RegisterEHFrameSectionWrapperName},
-           {DeregisterEHFrameSectionWrapper,
-            rt::DeregisterEHFrameSectionWrapperName}}))
+          {{RegisterEHFrameSectionAllocAction,
+            rt::RegisterEHFrameSectionAllocActionName},
+           {DeregisterEHFrameSectionAllocAction,
+            rt::DeregisterEHFrameSectionAllocActionName}}))
     return std::move(Err);
 
   return std::make_unique<EHFrameRegistrationPlugin>(
-      ES, RegisterEHFrameSectionWrapper, DeregisterEHFrameSectionWrapper);
+      RegisterEHFrameSectionAllocAction, DeregisterEHFrameSectionAllocAction);
 }
 
 void EHFrameRegistrationPlugin::modifyPassConfig(

llvm/lib/ExecutionEngine/Orc/EPCGenericRTDyldMemoryManager.cpp

@@ -28,8 +28,9 @@ EPCGenericRTDyldMemoryManager::CreateWithDefaultBootstrapSymbols(
            {SAs.Finalize, rt::SimpleExecutorMemoryManagerFinalizeWrapperName},
            {SAs.Deallocate,
             rt::SimpleExecutorMemoryManagerDeallocateWrapperName},
-           {SAs.RegisterEHFrame, rt::RegisterEHFrameSectionWrapperName},
-           {SAs.DeregisterEHFrame, rt::DeregisterEHFrameSectionWrapperName}}))
+           {SAs.RegisterEHFrame, rt::RegisterEHFrameSectionAllocActionName},
+           {SAs.DeregisterEHFrame,
+            rt::DeregisterEHFrameSectionAllocActionName}}))
     return std::move(Err);
   return std::make_unique<EPCGenericRTDyldMemoryManager>(EPC, std::move(SAs));
 }

llvm/lib/ExecutionEngine/Orc/LLJIT.cpp

@@ -1340,8 +1340,8 @@ LLLazyJIT::LLLazyJIT(LLLazyJITBuilderState &S, Error &Err) : LLJIT(S, Err) {
 // In-process LLJIT uses eh-frame section wrappers via EPC, so we need to force
 // them to be linked in.
 LLVM_ATTRIBUTE_USED void linkComponents() {
-  errs() << (void *)&llvm_orc_registerEHFrameSectionWrapper
-         << (void *)&llvm_orc_deregisterEHFrameSectionWrapper;
+  errs() << (void *)&llvm_orc_registerEHFrameSectionAllocAction
+         << (void *)&llvm_orc_deregisterEHFrameSectionAllocAction;
 }
 
 } // End namespace orc.

llvm/lib/ExecutionEngine/Orc/Shared/OrcRTBridge.cpp

@@ -52,10 +52,10 @@ const char *MemoryWriteBuffersWrapperName =
 const char *MemoryWritePointersWrapperName =
     "__llvm_orc_bootstrap_mem_write_pointers_wrapper";
 
-const char *RegisterEHFrameSectionWrapperName =
-    "llvm_orc_registerEHFrameSectionWrapper";
-const char *DeregisterEHFrameSectionWrapperName =
-    "llvm_orc_deregisterEHFrameSectionWrapper";
+const char *RegisterEHFrameSectionAllocActionName =
+    "llvm_orc_registerEHFrameAllocAction";
+const char *DeregisterEHFrameSectionAllocActionName =
+    "llvm_orc_deregisterEHFrameAllocAction";
 
 const char *RunAsMainWrapperName = "__llvm_orc_bootstrap_run_as_main_wrapper";
 const char *RunAsVoidFunctionWrapperName =

llvm/lib/ExecutionEngine/Orc/TargetProcess/DefaultHostBootstrapValues.cpp

@@ -22,10 +22,10 @@ void addDefaultBootstrapValuesForHostProcess(
     StringMap<ExecutorAddr> &BootstrapSymbols) {
 
   // FIXME: We probably shouldn't set these on Windows?
-  BootstrapSymbols[rt::RegisterEHFrameSectionWrapperName] =
-      ExecutorAddr::fromPtr(&llvm_orc_registerEHFrameSectionWrapper);
-  BootstrapSymbols[rt::DeregisterEHFrameSectionWrapperName] =
-      ExecutorAddr::fromPtr(&llvm_orc_deregisterEHFrameSectionWrapper);
+  BootstrapSymbols[rt::RegisterEHFrameSectionAllocActionName] =
+      ExecutorAddr::fromPtr(&llvm_orc_registerEHFrameSectionAllocAction);
+  BootstrapSymbols[rt::DeregisterEHFrameSectionAllocActionName] =
+      ExecutorAddr::fromPtr(&llvm_orc_deregisterEHFrameSectionAllocAction);
 
 #ifdef __APPLE__
   if (!dlsym(RTLD_DEFAULT, "__unw_add_find_dynamic_unwind_sections"))

llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp

@@ -164,14 +164,14 @@ static Error deregisterEHFrameWrapper(ExecutorAddrRange EHFrame) {
 }
 
 extern "C" orc::shared::CWrapperFunctionResult
-llvm_orc_registerEHFrameSectionWrapper(const char *Data, uint64_t Size) {
+llvm_orc_registerEHFrameSectionAllocAction(const char *Data, uint64_t Size) {
   return WrapperFunction<SPSError(SPSExecutorAddrRange)>::handle(
              Data, Size, registerEHFrameWrapper)
       .release();
 }
 
 extern "C" orc::shared::CWrapperFunctionResult
-llvm_orc_deregisterEHFrameSectionWrapper(const char *Data, uint64_t Size) {
+llvm_orc_deregisterEHFrameSectionAllocAction(const char *Data, uint64_t Size) {
   return WrapperFunction<SPSError(SPSExecutorAddrRange)>::handle(
              Data, Size, deregisterEHFrameWrapper)
       .release();

llvm/lib/ExecutionEngine/Orc/TargetProcess/SimpleRemoteEPCServer.cpp

@@ -207,10 +207,10 @@ Error SimpleRemoteEPCServer::sendSetupMessage(
          "Dispatch function name should not be set");
   EI.BootstrapSymbols[ExecutorSessionObjectName] = ExecutorAddr::fromPtr(this);
   EI.BootstrapSymbols[DispatchFnName] = ExecutorAddr::fromPtr(jitDispatchEntry);
-  EI.BootstrapSymbols[rt::RegisterEHFrameSectionWrapperName] =
-      ExecutorAddr::fromPtr(&llvm_orc_registerEHFrameSectionWrapper);
-  EI.BootstrapSymbols[rt::DeregisterEHFrameSectionWrapperName] =
-      ExecutorAddr::fromPtr(&llvm_orc_deregisterEHFrameSectionWrapper);
+  EI.BootstrapSymbols[rt::RegisterEHFrameSectionAllocActionName] =
+      ExecutorAddr::fromPtr(&llvm_orc_registerEHFrameSectionAllocAction);
+  EI.BootstrapSymbols[rt::DeregisterEHFrameSectionAllocActionName] =
+      ExecutorAddr::fromPtr(&llvm_orc_deregisterEHFrameSectionAllocAction);
 
   using SPSSerialize =
       shared::SPSArgList<shared::SPSSimpleRemoteEPCExecutorInfo>;