Skip to content

Commit c12392d

Browse files
committed
[cling] Remove duplicate EHFrameRegistrationPlugin
During the LLVM 20 development cycle, upstream commit llvm/llvm-project@d0052eb now installs the plugin during platform setup. This happens even with a custom ObjectLinkingLayerCreator as we do it, which lead to two plugins being added and registering the eh-frames twice. This causes assertions in libgcc during shutdown. Closes #20063
1 parent 2e371e3 commit c12392d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

interpreter/cling/lib/Interpreter/IncrementalJIT.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#include <clang/Basic/TargetOptions.h>
2020
#include <clang/Frontend/CompilerInstance.h>
2121

22-
#include <llvm/ExecutionEngine/JITLink/EHFrameSupport.h>
23-
#include <llvm/ExecutionEngine/Orc/EHFrameRegistrationPlugin.h>
2422
#include <llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h>
2523
#include <llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h>
2624
#include <llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h>
@@ -505,8 +503,6 @@ IncrementalJIT::IncrementalJIT(
505503
unsigned PageSize = cantFail(sys::Process::getPageSize());
506504
auto ObjLinkingLayer = std::make_unique<ObjectLinkingLayer>(
507505
ES, std::make_unique<ClingJITLinkMemoryManager>(PageSize));
508-
ObjLinkingLayer->addPlugin(std::make_unique<EHFrameRegistrationPlugin>(
509-
ES, std::make_unique<InProcessEHFrameRegistrar>()));
510506
return ObjLinkingLayer;
511507
}
512508

0 commit comments

Comments
 (0)