@@ -340,15 +340,16 @@ class OrcRPCExecutorProcessControlBase : public ExecutorProcessControl {
340
340
Expected<int32_t > runAsMain (ExecutorAddr MainFnAddr,
341
341
ArrayRef<std::string> Args) override {
342
342
DEBUG_WITH_TYPE (" orc" , {
343
- dbgs () << " Running as main: " << formatv (" {0:x16}" , MainFnAddr)
343
+ dbgs () << " Running as main: " << formatv (" {0:x16}" , MainFnAddr. getValue () )
344
344
<< " , args = [" ;
345
345
for (unsigned I = 0 ; I != Args.size (); ++I)
346
346
dbgs () << (I ? " ," : " " ) << " \" " << Args[I] << " \" " ;
347
347
dbgs () << " ]\n " ;
348
348
});
349
- auto Result = EP.template callB <orcrpctpc::RunMain>(MainFnAddr, Args);
349
+ auto Result =
350
+ EP.template callB <orcrpctpc::RunMain>(MainFnAddr.getValue (), Args);
350
351
DEBUG_WITH_TYPE (" orc" , {
351
- dbgs () << " call to " << formatv (" {0:x16}" , MainFnAddr);
352
+ dbgs () << " call to " << formatv (" {0:x16}" , MainFnAddr. getValue () );
352
353
if (Result)
353
354
dbgs () << " returned result " << *Result << " \n " ;
354
355
else
@@ -362,11 +363,11 @@ class OrcRPCExecutorProcessControlBase : public ExecutorProcessControl {
362
363
ArrayRef<char > ArgBuffer) override {
363
364
DEBUG_WITH_TYPE (" orc" , {
364
365
dbgs () << " Running as wrapper function "
365
- << formatv (" {0:x16}" , WrapperFnAddr) << " with "
366
+ << formatv (" {0:x16}" , WrapperFnAddr. getValue () ) << " with "
366
367
<< formatv (" {0:x16}" , ArgBuffer.size ()) << " argument buffer\n " ;
367
368
});
368
369
auto Result = EP.template callB <orcrpctpc::RunWrapper>(
369
- WrapperFnAddr,
370
+ WrapperFnAddr. getValue () ,
370
371
ArrayRef<uint8_t >(reinterpret_cast <const uint8_t *>(ArgBuffer.data ()),
371
372
ArgBuffer.size ()));
372
373
@@ -412,7 +413,7 @@ class OrcRPCExecutorProcessControlBase : public ExecutorProcessControl {
412
413
private:
413
414
Error runWrapperInJIT (
414
415
std::function<Error(Expected<shared::WrapperFunctionResult>)> SendResult,
415
- ExecutorAddr FunctionTag, std::vector<uint8_t> ArgBuffer) {
416
+ JITTargetAddress FunctionTag, std::vector<uint8_t> ArgBuffer) {
416
417
417
418
getExecutionSession ().runJITDispatchHandler (
418
419
[this , SendResult = std::move (SendResult)](
0 commit comments