Skip to content

Commit b04847b

Browse files
authored
Revert "Reapply "[ORC] Enable JIT support for the compact-unwind frame..." with fixes." (#125098)
This reverts commit d6524c8. This reverts commit b1bd737. This was causing bot failures on Darwin https://green.lab.llvm.org/job/llvm.org/job/clang-stage1-cmake-RA-incremental/7315/ Clang.Interpreter.simple-exception.cpp Clang-Unit.Interpreter/ExceptionTests/_/ClangReplInterpreterExceptionTests/0.1 LLVM.ExecutionEngine/OrcLazy.minimal-throw-catch.ll https://green.lab.llvm.org/job/llvm.org/job/clang-stage1-RA/3415/ ORC-x86_64-darwin.TestCases/Darwin/Generic.exceptions.cpp ORC-x86_64-darwin.TestCases/Darwin/x86-64.lljit-ehframe.cpp
1 parent 8a20c64 commit b04847b

24 files changed

+164
-1534
lines changed

clang/test/Interpreter/simple-exception.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// clang-format off
22
// UNSUPPORTED: system-aix
3-
// XFAIL for arm, or running on Windows.
4-
// XFAIL: target=arm-{{.*}}, target=armv{{.*}}, system-windows
3+
// XFAIL for arm and arm64, or running on Windows.
4+
// XFAIL: target=arm{{.*}}, system-windows
55
// RUN: cat %s | clang-repl | FileCheck %s
66

77
// Incompatible with msan. It passes with -O3 but fail -Oz. Interpreter

compiler-rt/lib/orc/macho_platform.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -557,12 +557,6 @@ Error MachOPlatformRuntimeState::registerObjectPlatformSections(
557557
return make_error<StringError>(ErrStream.str());
558558
}
559559

560-
ORC_RT_DEBUG({
561-
printdbg(" UnwindInfo: %s, UseCallbackStyleUnwindInfo: %s\n",
562-
UnwindInfo ? "true" : "false",
563-
UseCallbackStyleUnwindInfo ? "true" : "false");
564-
});
565-
566560
if (UnwindInfo && UseCallbackStyleUnwindInfo) {
567561
ORC_RT_DEBUG({
568562
printdbg(" Registering new-style unwind info for:\n"

compiler-rt/test/orc/TestCases/Darwin/Generic/exceptions.cpp

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

llvm/include/llvm/ExecutionEngine/Orc/Core.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,13 +1204,8 @@ class JITDylib : public ThreadSafeRefCountedBase<JITDylib>,
12041204

12051205
JITDylib(ExecutionSession &ES, std::string Name);
12061206

1207-
struct RemoveTrackerResult {
1208-
AsynchronousSymbolQuerySet QueriesToFail;
1209-
std::shared_ptr<SymbolDependenceMap> FailedSymbols;
1210-
std::vector<std::unique_ptr<MaterializationUnit>> DefunctMUs;
1211-
};
1212-
1213-
RemoveTrackerResult IL_removeTracker(ResourceTracker &RT);
1207+
std::pair<AsynchronousSymbolQuerySet, std::shared_ptr<SymbolDependenceMap>>
1208+
IL_removeTracker(ResourceTracker &RT);
12141209

12151210
void transferTracker(ResourceTracker &DstRT, ResourceTracker &SrcRT);
12161211

llvm/include/llvm/ExecutionEngine/Orc/ExecutorProcessControl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h"
2121
#include "llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h"
2222
#include "llvm/ExecutionEngine/Orc/SymbolStringPool.h"
23-
#include "llvm/ExecutionEngine/Orc/TargetProcess/UnwindInfoManager.h"
2423
#include "llvm/ExecutionEngine/Orc/TaskDispatch.h"
2524
#include "llvm/Support/DynamicLibrary.h"
2625
#include "llvm/Support/MSVCErrorWorkarounds.h"
@@ -508,9 +507,6 @@ class SelfExecutorProcessControl : public ExecutorProcessControl,
508507
SymbolLookupCompleteFn F) override;
509508

510509
std::unique_ptr<jitlink::JITLinkMemoryManager> OwnedMemMgr;
511-
#ifdef __APPLE__
512-
std::unique_ptr<UnwindInfoManager> UnwindInfoMgr;
513-
#endif // __APPLE__
514510
char GlobalManglingPrefix = 0;
515511
};
516512

llvm/include/llvm/ExecutionEngine/Orc/Shared/OrcRTBridge.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,6 @@ using SPSRunAsMainSignature = int64_t(shared::SPSExecutorAddr,
8888
using SPSRunAsVoidFunctionSignature = int32_t(shared::SPSExecutorAddr);
8989
using SPSRunAsIntFunctionSignature = int32_t(shared::SPSExecutorAddr, int32_t);
9090
} // end namespace rt
91-
92-
namespace rt_alt {
93-
extern const char *UnwindInfoManagerInstanceName;
94-
extern const char *UnwindInfoManagerFindSectionsHelperName;
95-
extern const char *UnwindInfoManagerEnableWrapperName;
96-
extern const char *UnwindInfoManagerDisableWrapperName;
97-
extern const char *UnwindInfoManagerRegisterActionName;
98-
extern const char *UnwindInfoManagerDeregisterActionName;
99-
} // end namespace rt_alt
10091
} // end namespace orc
10192
} // end namespace llvm
10293

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

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

llvm/include/llvm/ExecutionEngine/Orc/UnwindInfoRegistrationPlugin.h

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

llvm/lib/ExecutionEngine/JITLink/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ tablegen(LLVM COFFOptions.inc -gen-opt-parser-defs)
33
add_public_tablegen_target(JITLinkTableGen)
44

55
add_llvm_component_library(LLVMJITLink
6-
CompactUnwindSupport.cpp
76
DWARFRecordSectionSplitter.cpp
87
EHFrameSupport.cpp
98
JITLink.cpp

llvm/lib/ExecutionEngine/JITLink/CompactUnwindSupport.cpp

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

0 commit comments

Comments
 (0)