Skip to content

Commit f88be09

Browse files
weliveindetailgithub-actions[bot]
authored andcommitted
Automerge: [ORC] Remove now unused EPCDebugObjectRegistrar (NFC) (#167868)
EPCDebugObjectRegistrar is unused now that the ELF debugger support plugin uses AllocActions llvm/llvm-project#167866
2 parents 65114d3 + 907e851 commit f88be09

File tree

15 files changed

+5
-164
lines changed

15 files changed

+5
-164
lines changed

clang/lib/Interpreter/IncrementalExecutor.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "llvm/ExecutionEngine/ExecutionEngine.h"
2020
#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
2121
#include "llvm/ExecutionEngine/Orc/Debugging/DebuggerSupport.h"
22-
#include "llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h"
2322
#include "llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h"
2423
#include "llvm/ExecutionEngine/Orc/ExecutionUtils.h"
2524
#include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
@@ -47,8 +46,7 @@
4746

4847
// Force linking some of the runtimes that helps attaching to a debugger.
4948
LLVM_ATTRIBUTE_USED void linkComponents() {
50-
llvm::errs() << (void *)&llvm_orc_registerJITLoaderGDBWrapper
51-
<< (void *)&llvm_orc_registerJITLoaderGDBAllocAction;
49+
llvm::errs() << (void *)&llvm_orc_registerJITLoaderGDBAllocAction;
5250
}
5351

5452
namespace clang {

llvm/include/llvm-c/LLJITUtils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ LLVM_C_EXTERN_C_BEGIN
4040

4141
/**
4242
* Install the plugin that submits debug objects to the executor. Executors must
43-
* expose the llvm_orc_registerJITLoaderGDBWrapper symbol.
43+
* expose the llvm_orc_registerJITLoaderGDBAllocAction symbol.
4444
*/
4545
LLVM_C_ABI LLVMErrorRef LLVMOrcLLJITEnableDebugSupport(LLVMOrcLLJITRef J);
4646

llvm/include/llvm/ExecutionEngine/Orc/Debugging/DebuggerSupportPlugin.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#define LLVM_EXECUTIONENGINE_ORC_DEBUGGERSUPPORTPLUGIN_H
1515

1616
#include "llvm/ExecutionEngine/Orc/Core.h"
17-
#include "llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h"
1817
#include "llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h"
1918
#include "llvm/Support/Compiler.h"
2019

llvm/include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h

Lines changed: 0 additions & 69 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ struct jit_descriptor {
4343
};
4444
}
4545

46-
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
47-
llvm_orc_registerJITLoaderGDBWrapper(const char *ArgData, size_t ArgSize);
48-
4946
extern "C" LLVM_ABI llvm::orc::shared::CWrapperFunctionResult
5047
llvm_orc_registerJITLoaderGDBAllocAction(const char *ArgData, size_t ArgSize);
5148

llvm/lib/ExecutionEngine/Orc/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ add_llvm_component_library(LLVMOrcJIT
1717
DebugUtils.cpp
1818
EHFrameRegistrationPlugin.cpp
1919
EPCDynamicLibrarySearchGenerator.cpp
20-
EPCDebugObjectRegistrar.cpp
2120
EPCGenericDylibManager.cpp
2221
EPCGenericJITLinkMemoryManager.cpp
2322
EPCGenericRTDyldMemoryManager.cpp

llvm/lib/ExecutionEngine/Orc/EPCDebugObjectRegistrar.cpp

Lines changed: 0 additions & 61 deletions
This file was deleted.

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,3 @@ llvm_orc_registerJITLoaderGDBAllocAction(const char *ArgData, size_t ArgSize) {
8888
})
8989
.release();
9090
}
91-
92-
extern "C" orc::shared::CWrapperFunctionResult
93-
llvm_orc_registerJITLoaderGDBWrapper(const char *ArgData, size_t ArgSize) {
94-
using namespace orc::shared;
95-
return WrapperFunction<SPSError(SPSExecutorAddrRange, bool)>::handle(
96-
ArgData, ArgSize,
97-
[](ExecutorAddrRange R, bool AutoRegisterCode) {
98-
appendJITDebugDescriptor(R.Start.toPtr<const char *>(),
99-
R.size());
100-
// Run into the rendezvous breakpoint.
101-
if (AutoRegisterCode)
102-
__jit_debug_register_code();
103-
return Error::success();
104-
})
105-
.release();
106-
}

llvm/tools/lli/lli.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ static ExitOnError ExitOnErr;
283283
LLVM_ATTRIBUTE_USED static void linkComponents() {
284284
errs() << (void *)&llvm_orc_registerEHFrameSectionAllocAction
285285
<< (void *)&llvm_orc_deregisterEHFrameSectionAllocAction
286-
<< (void *)&llvm_orc_registerJITLoaderGDBWrapper
287286
<< (void *)&llvm_orc_registerJITLoaderGDBAllocAction;
288287
}
289288

llvm/tools/llvm-jitlink/llvm-jitlink-executor/llvm-jitlink-executor.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ ExitOnError ExitOnErr;
4444
LLVM_ATTRIBUTE_USED void linkComponents() {
4545
errs() << (void *)&llvm_orc_registerEHFrameSectionAllocAction
4646
<< (void *)&llvm_orc_deregisterEHFrameSectionAllocAction
47-
<< (void *)&llvm_orc_registerJITLoaderGDBWrapper
4847
<< (void *)&llvm_orc_registerJITLoaderGDBAllocAction;
4948
}
5049

0 commit comments

Comments
 (0)