Skip to content

Commit be0085b

Browse files
aaronj0vgvassilev
authored andcommitted
Add llvm libunwind callback to suppress exceptions on apple silicon
See llvm/llvm-project#49036
1 parent b6e6e3e commit be0085b

File tree

3 files changed

+65
-1
lines changed

3 files changed

+65
-1
lines changed

lib/Interpreter/Compatibility.h

+2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
#include "llvm/ADT/SmallString.h"
1818
#include "llvm/ADT/StringRef.h"
1919
#include "llvm/ADT/Twine.h"
20+
#include "llvm/BinaryFormat/MachO.h"
2021
#include "llvm/Config/llvm-config.h"
2122
#include "llvm/ExecutionEngine/JITSymbol.h"
2223
#include "llvm/ExecutionEngine/Orc/LLJIT.h"
24+
#include "llvm/Object/MachO.h"
2325
#include "llvm/Support/Casting.h"
2426
#include "llvm/Support/Path.h"
2527

lib/Interpreter/CppInterOp.cpp

+51-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,51 @@
4949
#include <unistd.h>
5050
#endif // WIN32
5151

52+
#ifdef __APPLE__
53+
// Define a minimal mach header for JIT'd code, to support exceptions on osx 14
54+
// and later. See llvm/llvm-project#49036
55+
static llvm::MachO::mach_header_64 fake_mach_header = {
56+
.magic = llvm::MachO::MH_MAGIC_64,
57+
.cputype = llvm::MachO::CPU_TYPE_ARM64,
58+
.cpusubtype = llvm::MachO::CPU_SUBTYPE_ARM64_ALL,
59+
.filetype = llvm::MachO::MH_DYLIB,
60+
.ncmds = 0,
61+
.sizeofcmds = 0,
62+
.flags = 0,
63+
.reserved = 0};
64+
65+
// Declare libunwind SPI types and functions.
66+
struct unw_dynamic_unwind_sections {
67+
uintptr_t dso_base;
68+
uintptr_t dwarf_section;
69+
size_t dwarf_section_length;
70+
uintptr_t compact_unwind_section;
71+
size_t compact_unwind_section_length;
72+
};
73+
74+
int find_dynamic_unwind_sections(uintptr_t addr,
75+
unw_dynamic_unwind_sections* info) {
76+
info->dso_base = (uintptr_t)&fake_mach_header;
77+
info->dwarf_section = 0;
78+
info->dwarf_section_length = 0;
79+
info->compact_unwind_section = 0;
80+
info->compact_unwind_section_length = 0;
81+
return 1;
82+
}
83+
84+
// Typedef for callback above.
85+
typedef int (*unw_find_dynamic_unwind_sections)(
86+
uintptr_t addr, struct unw_dynamic_unwind_sections* info);
87+
88+
void removeFindDynamicUnwindSections() {
89+
if (auto* unw_remove_find_dynamic_unwind_sections = (int (*)(
90+
unw_find_dynamic_unwind_sections find_dynamic_unwind_sections))
91+
dlsym(RTLD_DEFAULT, "__unw_remove_find_dynamic_unwind_sections"))
92+
unw_remove_find_dynamic_unwind_sections(find_dynamic_unwind_sections);
93+
}
94+
95+
#endif // __APPLE__
96+
5297
namespace Cpp {
5398

5499
using namespace clang;
@@ -62,7 +107,12 @@ namespace Cpp {
62107
// This might fix the issue https://reviews.llvm.org/D107087
63108
// FIXME: For now we just leak the Interpreter.
64109
struct InterpDeleter {
65-
~InterpDeleter() { sInterpreter.release(); }
110+
~InterpDeleter() {
111+
#ifdef __APPLE__
112+
removeFindDynamicUnwindSections();
113+
#endif
114+
sInterpreter.release();
115+
}
66116
} Deleter;
67117

68118
static compat::Interpreter& getInterp() {

unittests/CppInterOp/InterpreterTest.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,15 @@ TEST(InterpreterTest, CodeCompletion) {
127127
GTEST_SKIP();
128128
#endif
129129
}
130+
131+
TEST(InterpreterTest, InterpreterExceptions) {
132+
Cpp::CreateInterpreter();
133+
bool caught = false;
134+
try {
135+
EXPECT_TRUE(Cpp::Declare("int f() { throw; return 1; }") == 0);
136+
EXPECT_TRUE(Cpp::Process("int res = f();") == 0);
137+
} catch (...) {
138+
caught = true;
139+
}
140+
EXPECT_TRUE(caught) << "Unable to catch exception coming from interpreter";
141+
}

0 commit comments

Comments
 (0)