[llvm] 15e6bb6 - [ORC] Rename wrapper arguments to match conventions. NFCI.

Lang Hames via llvm-commits llvm-commits at lists.llvm.org
Wed Mar 12 13:36:25 PDT 2025


Author: Lang Hames
Date: 2025-03-13T07:36:17+11:00
New Revision: 15e6bb6224177805d8b6a8268f08a2b88ae4dd70

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

LOG: [ORC] Rename wrapper arguments to match conventions. NFCI.

Added: 
    

Modified: 
    llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
    llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.h
    llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.h
    llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
    llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp
    llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp
    llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.cpp
    llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp
    llvm/lib/ExecutionEngine/Orc/TargetProcess/UnwindInfoManager.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
index 1563d13468988..5a9517b1ce7cc 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h
@@ -44,9 +44,9 @@ struct jit_descriptor {
 }
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderGDBWrapper(const char *Data, uint64_t Size);
+llvm_orc_registerJITLoaderGDBWrapper(const char *ArgData, size_t ArgSize);
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderGDBAllocAction(const char *Data, size_t Size);
+llvm_orc_registerJITLoaderGDBAllocAction(const char *ArgData, size_t ArgSize);
 
 #endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_JITLOADERGDB_H

diff  --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.h
index aa9951a23b99e..fa74c835d64b4 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.h
@@ -18,12 +18,12 @@
 #include <cstdint>
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfImpl(const char *Data, uint64_t Size);
+llvm_orc_registerJITLoaderPerfImpl(const char *ArgData, size_t ArgSize);
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfStart(const char *Data, uint64_t Size);
+llvm_orc_registerJITLoaderPerfStart(const char *ArgData, size_t ArgSize);
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfEnd(const char *Data, uint64_t Size);
+llvm_orc_registerJITLoaderPerfEnd(const char *ArgData, size_t ArgSize);
 
 #endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_JITLOADERPERF_H
\ No newline at end of file

diff  --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.h
index 63a0d7325d5ad..d8c64cc69904a 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.h
@@ -19,13 +19,13 @@
 #include <cstdint>
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerVTuneImpl(const char *Data, uint64_t Size);
+llvm_orc_registerVTuneImpl(const char *ArgData, size_t ArgSize);
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_unregisterVTuneImpl(const char *Data, uint64_t Size);
+llvm_orc_unregisterVTuneImpl(const char *ArgData, size_t ArgSize);
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_test_registerVTuneImpl(const char *Data, uint64_t Size);
+llvm_orc_test_registerVTuneImpl(const char *ArgData, size_t ArgSize);
 
 #endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_JITLOADERVTUNE_H
 

diff  --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
index 0c56fa885cf4d..9f84fdc8e7a4b 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h
@@ -35,9 +35,10 @@ Error deregisterEHFrameSection(const void *EHFrameSectionAddr,
 } // end namespace llvm
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerEHFrameSectionAllocAction(const char *Data, uint64_t Size);
+llvm_orc_registerEHFrameSectionAllocAction(const char *ArgData, size_t ArgSize);
 
 extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_deregisterEHFrameSectionAllocAction(const char *Data, uint64_t Size);
+llvm_orc_deregisterEHFrameSectionAllocAction(const char *ArgData,
+                                             size_t ArgSize);
 
 #endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_REGISTEREHFRAMES_H

diff  --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp
index 68215017fb200..fd626321c973e 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp
@@ -75,10 +75,10 @@ static void appendJITDebugDescriptor(const char *ObjAddr, size_t Size) {
 }
 
 extern "C" orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderGDBAllocAction(const char *Data, size_t Size) {
+llvm_orc_registerJITLoaderGDBAllocAction(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
   return WrapperFunction<SPSError(SPSExecutorAddrRange, bool)>::handle(
-             Data, Size,
+             ArgData, ArgSize,
              [](ExecutorAddrRange R, bool AutoRegisterCode) {
                appendJITDebugDescriptor(R.Start.toPtr<const char *>(),
                                         R.size());
@@ -91,10 +91,10 @@ llvm_orc_registerJITLoaderGDBAllocAction(const char *Data, size_t Size) {
 }
 
 extern "C" orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderGDBWrapper(const char *Data, uint64_t Size) {
+llvm_orc_registerJITLoaderGDBWrapper(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
   return WrapperFunction<SPSError(SPSExecutorAddrRange, bool)>::handle(
-             Data, Size,
+             ArgData, ArgSize,
              [](ExecutorAddrRange R, bool AutoRegisterCode) {
                appendJITDebugDescriptor(R.Start.toPtr<const char *>(),
                                         R.size());

diff  --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp
index ec576599760cd..1a61d3188a820 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp
@@ -396,25 +396,25 @@ static Error registerJITLoaderPerfEndImpl() {
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfImpl(const char *Data, uint64_t Size) {
+llvm_orc_registerJITLoaderPerfImpl(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
   return WrapperFunction<SPSError(SPSPerfJITRecordBatch)>::handle(
-             Data, Size, registerJITLoaderPerfImpl)
+             ArgData, ArgSize, registerJITLoaderPerfImpl)
       .release();
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfStart(const char *Data, uint64_t Size) {
+llvm_orc_registerJITLoaderPerfStart(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
-  return WrapperFunction<SPSError()>::handle(Data, Size,
+  return WrapperFunction<SPSError()>::handle(ArgData, ArgSize,
                                              registerJITLoaderPerfStartImpl)
       .release();
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfEnd(const char *Data, uint64_t Size) {
+llvm_orc_registerJITLoaderPerfEnd(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
-  return WrapperFunction<SPSError()>::handle(Data, Size,
+  return WrapperFunction<SPSError()>::handle(ArgData, ArgSize,
                                              registerJITLoaderPerfEndImpl)
       .release();
 }
@@ -434,23 +434,23 @@ static Error badOS() {
 static Error badOSBatch(PerfJITRecordBatch &Batch) { return badOS(); }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfImpl(const char *Data, uint64_t Size) {
+llvm_orc_registerJITLoaderPerfImpl(const char *ArgData, size_t ArgSize) {
   using namespace shared;
-  return WrapperFunction<SPSError(SPSPerfJITRecordBatch)>::handle(Data, Size,
-                                                                  badOSBatch)
+  return WrapperFunction<SPSError(SPSPerfJITRecordBatch)>::handle(
+             ArgData, ArgSize, badOSBatch)
       .release();
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfStart(const char *Data, uint64_t Size) {
+llvm_orc_registerJITLoaderPerfStart(const char *ArgData, size_t ArgSize) {
   using namespace shared;
-  return WrapperFunction<SPSError()>::handle(Data, Size, badOS).release();
+  return WrapperFunction<SPSError()>::handle(ArgData, ArgSize, badOS).release();
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerJITLoaderPerfEnd(const char *Data, uint64_t Size) {
+llvm_orc_registerJITLoaderPerfEnd(const char *ArgData, size_t ArgSize) {
   using namespace shared;
-  return WrapperFunction<SPSError()>::handle(Data, Size, badOS).release();
+  return WrapperFunction<SPSError()>::handle(ArgData, ArgSize, badOS).release();
 }
 
 #endif

diff  --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.cpp
index 5a4698f0fa68d..8f988c9689778 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.cpp
@@ -92,21 +92,21 @@ static void registerJITLoaderVTuneUnregisterImpl(
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerVTuneImpl(const char *Data, uint64_t Size) {
+llvm_orc_registerVTuneImpl(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
   if (!JITEventWrapper::Wrapper)
     JITEventWrapper::Wrapper.reset(new IntelJITEventsWrapper);
 
   return WrapperFunction<SPSError(SPSVTuneMethodBatch)>::handle(
-             Data, Size, registerJITLoaderVTuneRegisterImpl)
+             ArgData, ArgSize, registerJITLoaderVTuneRegisterImpl)
       .release();
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_unregisterVTuneImpl(const char *Data, uint64_t Size) {
+llvm_orc_unregisterVTuneImpl(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
   return WrapperFunction<void(SPSVTuneUnloadedMethodIDs)>::handle(
-             Data, Size, registerJITLoaderVTuneUnregisterImpl)
+             ArgData, ArgSize, registerJITLoaderVTuneUnregisterImpl)
       .release();
 }
 
@@ -174,12 +174,12 @@ static unsigned int GetNewMethodID(void) {
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_test_registerVTuneImpl(const char *Data, uint64_t Size) {
+llvm_orc_test_registerVTuneImpl(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
   JITEventWrapper::Wrapper.reset(new IntelJITEventsWrapper(
       NotifyEvent, NULL, NULL, IsProfilingActive, 0, 0, GetNewMethodID));
   return WrapperFunction<SPSError(SPSVTuneMethodBatch)>::handle(
-             Data, Size, registerJITLoaderVTuneRegisterImpl)
+             ArgData, ArgSize, registerJITLoaderVTuneRegisterImpl)
       .release();
 }
 
@@ -198,26 +198,26 @@ static void unsuppported(const std::vector<std::pair<uint64_t, uint64_t>> &UM) {
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_registerVTuneImpl(const char *Data, uint64_t Size) {
+llvm_orc_registerVTuneImpl(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
   return WrapperFunction<SPSError(SPSVTuneMethodBatch)>::handle(
-             Data, Size, unsupportedBatch)
+             ArgData, ArgSize, unsupportedBatch)
       .release();
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_unregisterVTuneImpl(const char *Data, uint64_t Size) {
+llvm_orc_unregisterVTuneImpl(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
-  return WrapperFunction<void(SPSVTuneUnloadedMethodIDs)>::handle(Data, Size,
-                                                                  unsuppported)
+  return WrapperFunction<void(SPSVTuneUnloadedMethodIDs)>::handle(
+             ArgData, ArgSize, unsuppported)
       .release();
 }
 
 extern "C" llvm::orc::shared::CWrapperFunctionResult
-llvm_orc_test_registerVTuneImpl(const char *Data, uint64_t Size) {
+llvm_orc_test_registerVTuneImpl(const char *ArgData, size_t ArgSize) {
   using namespace orc::shared;
   return WrapperFunction<SPSError(SPSVTuneMethodBatch)>::handle(
-             Data, Size, unsupportedBatch)
+             ArgData, ArgSize, unsupportedBatch)
       .release();
 }
 

diff  --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp
index fbaf2bae25f4b..f44a5f2889a22 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.cpp
@@ -164,15 +164,17 @@ static Error deregisterEHFrameWrapper(ExecutorAddrRange EHFrame) {
 }
 
 extern "C" orc::shared::CWrapperFunctionResult
-llvm_orc_registerEHFrameSectionAllocAction(const char *Data, uint64_t Size) {
+llvm_orc_registerEHFrameSectionAllocAction(const char *ArgData,
+                                           size_t ArgSize) {
   return WrapperFunction<SPSError(SPSExecutorAddrRange)>::handle(
-             Data, Size, registerEHFrameWrapper)
+             ArgData, ArgSize, registerEHFrameWrapper)
       .release();
 }
 
 extern "C" orc::shared::CWrapperFunctionResult
-llvm_orc_deregisterEHFrameSectionAllocAction(const char *Data, uint64_t Size) {
+llvm_orc_deregisterEHFrameSectionAllocAction(const char *ArgData,
+                                             size_t ArgSize) {
   return WrapperFunction<SPSError(SPSExecutorAddrRange)>::handle(
-             Data, Size, deregisterEHFrameWrapper)
+             ArgData, ArgSize, deregisterEHFrameWrapper)
       .release();
 }

diff  --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/UnwindInfoManager.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/UnwindInfoManager.cpp
index 7510079f87b84..3a9aa54155ba2 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/UnwindInfoManager.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/UnwindInfoManager.cpp
@@ -21,12 +21,13 @@ using namespace llvm::orc;
 using namespace llvm::orc::shared;
 
 static orc::shared::CWrapperFunctionResult
-llvm_orc_rt_alt_UnwindInfoManager_register(const char *Data, uint64_t Size) {
+llvm_orc_rt_alt_UnwindInfoManager_register(const char *ArgData,
+                                           size_t ArgSize) {
   using SPSSig = SPSError(SPSSequence<SPSExecutorAddrRange>, SPSExecutorAddr,
                           SPSExecutorAddrRange, SPSExecutorAddrRange);
 
   return WrapperFunction<SPSSig>::handle(
-             Data, Size,
+             ArgData, ArgSize,
              [](std::vector<ExecutorAddrRange> CodeRanges, ExecutorAddr DSOBase,
                 ExecutorAddrRange DWARFRange,
                 ExecutorAddrRange CompactUnwindRange) {
@@ -37,11 +38,12 @@ llvm_orc_rt_alt_UnwindInfoManager_register(const char *Data, uint64_t Size) {
 }
 
 static orc::shared::CWrapperFunctionResult
-llvm_orc_rt_alt_UnwindInfoManager_deregister(const char *Data, uint64_t Size) {
+llvm_orc_rt_alt_UnwindInfoManager_deregister(const char *ArgData,
+                                             size_t ArgSize) {
   using SPSSig = SPSError(SPSSequence<SPSExecutorAddrRange>);
 
   return WrapperFunction<SPSSig>::handle(
-             Data, Size,
+             ArgData, ArgSize,
              [](std::vector<ExecutorAddrRange> CodeRanges) {
                return UnwindInfoManager::deregisterSections(CodeRanges);
              })


        


More information about the llvm-commits mailing list