aboutsummaryrefslogtreecommitdiff
path: root/lib/libunwind/src/Unwind-seh.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-08-04 17:39:29 -0700
committerAndrew Kelley <andrew@ziglang.org>2020-08-04 17:39:29 -0700
commit372062b4fe148c17a42ff0938781748ca1dc8328 (patch)
tree099c03a994ffe8a502cbe82281b5ae15e738760c /lib/libunwind/src/Unwind-seh.cpp
parent42da1d385de8559710e04b5a05234f2dd8bb347e (diff)
downloadzig-372062b4fe148c17a42ff0938781748ca1dc8328.tar.gz
zig-372062b4fe148c17a42ff0938781748ca1dc8328.zip
libunwind: update from LLVM 10 to 11rc1
Diffstat (limited to 'lib/libunwind/src/Unwind-seh.cpp')
-rw-r--r--lib/libunwind/src/Unwind-seh.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libunwind/src/Unwind-seh.cpp b/lib/libunwind/src/Unwind-seh.cpp
index 7647f2e0db..403ab2d771 100644
--- a/lib/libunwind/src/Unwind-seh.cpp
+++ b/lib/libunwind/src/Unwind-seh.cpp
@@ -69,7 +69,7 @@ static void __unw_seh_set_disp_ctx(unw_cursor_t *cursor,
/// b) Initiate a collided unwind to halt unwinding.
_LIBUNWIND_EXPORT EXCEPTION_DISPOSITION
_GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx,
- DISPATCHER_CONTEXT *disp, __personality_routine pers) {
+ DISPATCHER_CONTEXT *disp, _Unwind_Personality_Fn pers) {
unw_cursor_t cursor;
_Unwind_Exception *exc;
_Unwind_Action action;
@@ -290,8 +290,8 @@ unwind_phase2_forced(unw_context_t *uc,
// If there is a personality routine, tell it we are unwinding.
if (frameInfo.handler != 0) {
- __personality_routine p =
- (__personality_routine)(intptr_t)(frameInfo.handler);
+ _Unwind_Personality_Fn p =
+ (_Unwind_Personality_Fn)(intptr_t)(frameInfo.handler);
_LIBUNWIND_TRACE_UNWINDING(
"unwind_phase2_forced(ex_ojb=%p): calling personality function %p",
(void *)exception_object, (void *)(uintptr_t)p);