Skip to content

Commit 15e6bb6

Browse files
lhameslhames
committed
[ORC] Rename wrapper arguments to match conventions. NFCI.
1 parent 9d7e1d9 commit 15e6bb6

File tree

9 files changed

+53
-48
lines changed

9 files changed

+53
-48
lines changed

‎llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ struct jit_descriptor {
4444
}
4545

4646
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
47-
llvm_orc_registerJITLoaderGDBWrapper(const char *Data, uint64_t Size);
47+
llvm_orc_registerJITLoaderGDBWrapper(const char *ArgData, size_t ArgSize);
4848

4949
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
50-
llvm_orc_registerJITLoaderGDBAllocAction(const char *Data, size_t Size);
50+
llvm_orc_registerJITLoaderGDBAllocAction(const char *ArgData, size_t ArgSize);
5151

5252
#endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_JITLOADERGDB_H

‎llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
#include <cstdint>
1919

2020
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
21-
llvm_orc_registerJITLoaderPerfImpl(const char *Data, uint64_t Size);
21+
llvm_orc_registerJITLoaderPerfImpl(const char *ArgData, size_t ArgSize);
2222

2323
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
24-
llvm_orc_registerJITLoaderPerfStart(const char *Data, uint64_t Size);
24+
llvm_orc_registerJITLoaderPerfStart(const char *ArgData, size_t ArgSize);
2525

2626
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
27-
llvm_orc_registerJITLoaderPerfEnd(const char *Data, uint64_t Size);
27+
llvm_orc_registerJITLoaderPerfEnd(const char *ArgData, size_t ArgSize);
2828

2929
#endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_JITLOADERPERF_H

‎llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#include <cstdint>
2020

2121
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
22-
llvm_orc_registerVTuneImpl(const char *Data, uint64_t Size);
22+
llvm_orc_registerVTuneImpl(const char *ArgData, size_t ArgSize);
2323

2424
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
25-
llvm_orc_unregisterVTuneImpl(const char *Data, uint64_t Size);
25+
llvm_orc_unregisterVTuneImpl(const char *ArgData, size_t ArgSize);
2626

2727
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
28-
llvm_orc_test_registerVTuneImpl(const char *Data, uint64_t Size);
28+
llvm_orc_test_registerVTuneImpl(const char *ArgData, size_t ArgSize);
2929

3030
#endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_JITLOADERVTUNE_H
3131

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ Error deregisterEHFrameSection(const void *EHFrameSectionAddr,
3535
} // end namespace llvm
3636

3737
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
38-
llvm_orc_registerEHFrameSectionAllocAction(const char *Data, uint64_t Size);
38+
llvm_orc_registerEHFrameSectionAllocAction(const char *ArgData, size_t ArgSize);
3939

4040
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
41-
llvm_orc_deregisterEHFrameSectionAllocAction(const char *Data, uint64_t Size);
41+
llvm_orc_deregisterEHFrameSectionAllocAction(const char *ArgData,
42+
size_t ArgSize);
4243

4344
#endif // LLVM_EXECUTIONENGINE_ORC_TARGETPROCESS_REGISTEREHFRAMES_H

‎llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ static void appendJITDebugDescriptor(const char *ObjAddr, size_t Size) {
7575
}
7676

7777
extern "C" orc::shared::CWrapperFunctionResult
78-
llvm_orc_registerJITLoaderGDBAllocAction(const char *Data, size_t Size) {
78+
llvm_orc_registerJITLoaderGDBAllocAction(const char *ArgData, size_t ArgSize) {
7979
using namespace orc::shared;
8080
return WrapperFunction<SPSError(SPSExecutorAddrRange, bool)>::handle(
81-
Data, Size,
81+
ArgData, ArgSize,
8282
[](ExecutorAddrRange R, bool AutoRegisterCode) {
8383
appendJITDebugDescriptor(R.Start.toPtr<const char *>(),
8484
R.size());
@@ -91,10 +91,10 @@ llvm_orc_registerJITLoaderGDBAllocAction(const char *Data, size_t Size) {
9191
}
9292

9393
extern "C" orc::shared::CWrapperFunctionResult
94-
llvm_orc_registerJITLoaderGDBWrapper(const char *Data, uint64_t Size) {
94+
llvm_orc_registerJITLoaderGDBWrapper(const char *ArgData, size_t ArgSize) {
9595
using namespace orc::shared;
9696
return WrapperFunction<SPSError(SPSExecutorAddrRange, bool)>::handle(
97-
Data, Size,
97+
ArgData, ArgSize,
9898
[](ExecutorAddrRange R, bool AutoRegisterCode) {
9999
appendJITDebugDescriptor(R.Start.toPtr<const char *>(),
100100
R.size());

‎llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderPerf.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -396,25 +396,25 @@ static Error registerJITLoaderPerfEndImpl() {
396396
}
397397

398398
extern "C" llvm::orc::shared::CWrapperFunctionResult
399-
llvm_orc_registerJITLoaderPerfImpl(const char *Data, uint64_t Size) {
399+
llvm_orc_registerJITLoaderPerfImpl(const char *ArgData, size_t ArgSize) {
400400
using namespace orc::shared;
401401
return WrapperFunction<SPSError(SPSPerfJITRecordBatch)>::handle(
402-
Data, Size, registerJITLoaderPerfImpl)
402+
ArgData, ArgSize, registerJITLoaderPerfImpl)
403403
.release();
404404
}
405405

406406
extern "C" llvm::orc::shared::CWrapperFunctionResult
407-
llvm_orc_registerJITLoaderPerfStart(const char *Data, uint64_t Size) {
407+
llvm_orc_registerJITLoaderPerfStart(const char *ArgData, size_t ArgSize) {
408408
using namespace orc::shared;
409-
return WrapperFunction<SPSError()>::handle(Data, Size,
409+
return WrapperFunction<SPSError()>::handle(ArgData, ArgSize,
410410
registerJITLoaderPerfStartImpl)
411411
.release();
412412
}
413413

414414
extern "C" llvm::orc::shared::CWrapperFunctionResult
415-
llvm_orc_registerJITLoaderPerfEnd(const char *Data, uint64_t Size) {
415+
llvm_orc_registerJITLoaderPerfEnd(const char *ArgData, size_t ArgSize) {
416416
using namespace orc::shared;
417-
return WrapperFunction<SPSError()>::handle(Data, Size,
417+
return WrapperFunction<SPSError()>::handle(ArgData, ArgSize,
418418
registerJITLoaderPerfEndImpl)
419419
.release();
420420
}
@@ -434,23 +434,23 @@ static Error badOS() {
434434
static Error badOSBatch(PerfJITRecordBatch &Batch) { return badOS(); }
435435

436436
extern "C" llvm::orc::shared::CWrapperFunctionResult
437-
llvm_orc_registerJITLoaderPerfImpl(const char *Data, uint64_t Size) {
437+
llvm_orc_registerJITLoaderPerfImpl(const char *ArgData, size_t ArgSize) {
438438
using namespace shared;
439-
return WrapperFunction<SPSError(SPSPerfJITRecordBatch)>::handle(Data, Size,
440-
badOSBatch)
439+
return WrapperFunction<SPSError(SPSPerfJITRecordBatch)>::handle(
440+
ArgData, ArgSize, badOSBatch)
441441
.release();
442442
}
443443

444444
extern "C" llvm::orc::shared::CWrapperFunctionResult
445-
llvm_orc_registerJITLoaderPerfStart(const char *Data, uint64_t Size) {
445+
llvm_orc_registerJITLoaderPerfStart(const char *ArgData, size_t ArgSize) {
446446
using namespace shared;
447-
return WrapperFunction<SPSError()>::handle(Data, Size, badOS).release();
447+
return WrapperFunction<SPSError()>::handle(ArgData, ArgSize, badOS).release();
448448
}
449449

450450
extern "C" llvm::orc::shared::CWrapperFunctionResult
451-
llvm_orc_registerJITLoaderPerfEnd(const char *Data, uint64_t Size) {
451+
llvm_orc_registerJITLoaderPerfEnd(const char *ArgData, size_t ArgSize) {
452452
using namespace shared;
453-
return WrapperFunction<SPSError()>::handle(Data, Size, badOS).release();
453+
return WrapperFunction<SPSError()>::handle(ArgData, ArgSize, badOS).release();
454454
}
455455

456456
#endif

‎llvm/lib/ExecutionEngine/Orc/TargetProcess/JITLoaderVTune.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,21 @@ static void registerJITLoaderVTuneUnregisterImpl(
9292
}
9393

9494
extern "C" llvm::orc::shared::CWrapperFunctionResult
95-
llvm_orc_registerVTuneImpl(const char *Data, uint64_t Size) {
95+
llvm_orc_registerVTuneImpl(const char *ArgData, size_t ArgSize) {
9696
using namespace orc::shared;
9797
if (!JITEventWrapper::Wrapper)
9898
JITEventWrapper::Wrapper.reset(new IntelJITEventsWrapper);
9999

100100
return WrapperFunction<SPSError(SPSVTuneMethodBatch)>::handle(
101-
Data, Size, registerJITLoaderVTuneRegisterImpl)
101+
ArgData, ArgSize, registerJITLoaderVTuneRegisterImpl)
102102
.release();
103103
}
104104

105105
extern "C" llvm::orc::shared::CWrapperFunctionResult
106-
llvm_orc_unregisterVTuneImpl(const char *Data, uint64_t Size) {
106+
llvm_orc_unregisterVTuneImpl(const char *ArgData, size_t ArgSize) {
107107
using namespace orc::shared;
108108
return WrapperFunction<void(SPSVTuneUnloadedMethodIDs)>::handle(
109-
Data, Size, registerJITLoaderVTuneUnregisterImpl)
109+
ArgData, ArgSize, registerJITLoaderVTuneUnregisterImpl)
110110
.release();
111111
}
112112

@@ -174,12 +174,12 @@ static unsigned int GetNewMethodID(void) {
174174
}
175175

176176
extern "C" llvm::orc::shared::CWrapperFunctionResult
177-
llvm_orc_test_registerVTuneImpl(const char *Data, uint64_t Size) {
177+
llvm_orc_test_registerVTuneImpl(const char *ArgData, size_t ArgSize) {
178178
using namespace orc::shared;
179179
JITEventWrapper::Wrapper.reset(new IntelJITEventsWrapper(
180180
NotifyEvent, NULL, NULL, IsProfilingActive, 0, 0, GetNewMethodID));
181181
return WrapperFunction<SPSError(SPSVTuneMethodBatch)>::handle(
182-
Data, Size, registerJITLoaderVTuneRegisterImpl)
182+
ArgData, ArgSize, registerJITLoaderVTuneRegisterImpl)
183183
.release();
184184
}
185185

@@ -198,26 +198,26 @@ static void unsuppported(const std::vector<std::pair<uint64_t, uint64_t>> &UM) {
198198
}
199199

200200
extern "C" llvm::orc::shared::CWrapperFunctionResult
201-
llvm_orc_registerVTuneImpl(const char *Data, uint64_t Size) {
201+
llvm_orc_registerVTuneImpl(const char *ArgData, size_t ArgSize) {
202202
using namespace orc::shared;
203203
return WrapperFunction<SPSError(SPSVTuneMethodBatch)>::handle(
204-
Data, Size, unsupportedBatch)
204+
ArgData, ArgSize, unsupportedBatch)
205205
.release();
206206
}
207207

208208
extern "C" llvm::orc::shared::CWrapperFunctionResult
209-
llvm_orc_unregisterVTuneImpl(const char *Data, uint64_t Size) {
209+
llvm_orc_unregisterVTuneImpl(const char *ArgData, size_t ArgSize) {
210210
using namespace orc::shared;
211-
return WrapperFunction<void(SPSVTuneUnloadedMethodIDs)>::handle(Data, Size,
212-
unsuppported)
211+
return WrapperFunction<void(SPSVTuneUnloadedMethodIDs)>::handle(
212+
ArgData, ArgSize, unsuppported)
213213
.release();
214214
}
215215

216216
extern "C" llvm::orc::shared::CWrapperFunctionResult
217-
llvm_orc_test_registerVTuneImpl(const char *Data, uint64_t Size) {
217+
llvm_orc_test_registerVTuneImpl(const char *ArgData, size_t ArgSize) {
218218
using namespace orc::shared;
219219
return WrapperFunction<SPSError(SPSVTuneMethodBatch)>::handle(
220-
Data, Size, unsupportedBatch)
220+
ArgData, ArgSize, unsupportedBatch)
221221
.release();
222222
}
223223

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,17 @@ static Error deregisterEHFrameWrapper(ExecutorAddrRange EHFrame) {
164164
}
165165

166166
extern "C" orc::shared::CWrapperFunctionResult
167-
llvm_orc_registerEHFrameSectionAllocAction(const char *Data, uint64_t Size) {
167+
llvm_orc_registerEHFrameSectionAllocAction(const char *ArgData,
168+
size_t ArgSize) {
168169
return WrapperFunction<SPSError(SPSExecutorAddrRange)>::handle(
169-
Data, Size, registerEHFrameWrapper)
170+
ArgData, ArgSize, registerEHFrameWrapper)
170171
.release();
171172
}
172173

173174
extern "C" orc::shared::CWrapperFunctionResult
174-
llvm_orc_deregisterEHFrameSectionAllocAction(const char *Data, uint64_t Size) {
175+
llvm_orc_deregisterEHFrameSectionAllocAction(const char *ArgData,
176+
size_t ArgSize) {
175177
return WrapperFunction<SPSError(SPSExecutorAddrRange)>::handle(
176-
Data, Size, deregisterEHFrameWrapper)
178+
ArgData, ArgSize, deregisterEHFrameWrapper)
177179
.release();
178180
}

‎llvm/lib/ExecutionEngine/Orc/TargetProcess/UnwindInfoManager.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ using namespace llvm::orc;
2121
using namespace llvm::orc::shared;
2222

2323
static orc::shared::CWrapperFunctionResult
24-
llvm_orc_rt_alt_UnwindInfoManager_register(const char *Data, uint64_t Size) {
24+
llvm_orc_rt_alt_UnwindInfoManager_register(const char *ArgData,
25+
size_t ArgSize) {
2526
using SPSSig = SPSError(SPSSequence<SPSExecutorAddrRange>, SPSExecutorAddr,
2627
SPSExecutorAddrRange, SPSExecutorAddrRange);
2728

2829
return WrapperFunction<SPSSig>::handle(
29-
Data, Size,
30+
ArgData, ArgSize,
3031
[](std::vector<ExecutorAddrRange> CodeRanges, ExecutorAddr DSOBase,
3132
ExecutorAddrRange DWARFRange,
3233
ExecutorAddrRange CompactUnwindRange) {
@@ -37,11 +38,12 @@ llvm_orc_rt_alt_UnwindInfoManager_register(const char *Data, uint64_t Size) {
3738
}
3839

3940
static orc::shared::CWrapperFunctionResult
40-
llvm_orc_rt_alt_UnwindInfoManager_deregister(const char *Data, uint64_t Size) {
41+
llvm_orc_rt_alt_UnwindInfoManager_deregister(const char *ArgData,
42+
size_t ArgSize) {
4143
using SPSSig = SPSError(SPSSequence<SPSExecutorAddrRange>);
4244

4345
return WrapperFunction<SPSSig>::handle(
44-
Data, Size,
46+
ArgData, ArgSize,
4547
[](std::vector<ExecutorAddrRange> CodeRanges) {
4648
return UnwindInfoManager::deregisterSections(CodeRanges);
4749
})

0 commit comments

Comments
 (0)