this repo has no description
Fix ObjC exceptions on ABI 2
+10
-1
+10
-1
src/libobjcdarwin/new/exceptions.cpp
+10
-1
src/libobjcdarwin/new/exceptions.cpp
···
5
5
extern "C" void* __cxa_begin_catch(void*);
6
6
extern "C" void __cxa_end_catch();
7
7
8
+
static __thread bool m_cxx = false;
9
+
8
10
void objc_exception_rethrow()
9
11
{
10
12
__cxa_rethrow();
···
15
17
void *rv = returnReturn();
16
18
void* cpp = __cxa_begin_catch(p);
17
19
if (cpp)
20
+
{
21
+
m_cxx = true;
18
22
return cpp;
23
+
}
19
24
else
25
+
{
26
+
m_cxx = false;
20
27
return rv;
28
+
}
21
29
}
22
30
23
31
void objc_end_catch()
24
32
{
25
-
__cxa_end_catch();
33
+
if (m_cxx)
34
+
__cxa_end_catch();
26
35
}
27
36