diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-08-04 18:09:10 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-08-04 18:09:10 -0700 |
| commit | 2f635c3ce9be74f9e9ffb71324f7ba51bd2987f4 (patch) | |
| tree | f04b0f4fb7a0e5ce0e36829bfd9aaa032447ac2a /lib/libunwind/src/Unwind-seh.cpp | |
| parent | c0d9578a84c95f66f34729f6c8842a98a995f223 (diff) | |
| download | zig-2f635c3ce9be74f9e9ffb71324f7ba51bd2987f4.tar.gz zig-2f635c3ce9be74f9e9ffb71324f7ba51bd2987f4.zip | |
update libunwind to LLVM 15
release/15.x commit 134fd359a5d884f16662a9edd22ab24feeb1498c
Diffstat (limited to 'lib/libunwind/src/Unwind-seh.cpp')
| -rw-r--r-- | lib/libunwind/src/Unwind-seh.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libunwind/src/Unwind-seh.cpp b/lib/libunwind/src/Unwind-seh.cpp index f00bc4721b..c2c31045a3 100644 --- a/lib/libunwind/src/Unwind-seh.cpp +++ b/lib/libunwind/src/Unwind-seh.cpp @@ -104,7 +104,7 @@ _GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx, if (!ctx) { __unw_init_seh(&cursor, disp->ContextRecord); __unw_seh_set_disp_ctx(&cursor, disp); - __unw_set_reg(&cursor, UNW_REG_IP, disp->ControlPc - 1); + __unw_set_reg(&cursor, UNW_REG_IP, disp->ControlPc); ctx = (struct _Unwind_Context *)&cursor; if (!IS_UNWINDING(ms_exc->ExceptionFlags)) { @@ -255,8 +255,8 @@ unwind_phase2_forced(unw_context_t *uc, (frameInfo.start_ip + offset > frameInfo.end_ip)) functionName = ".anonymous."; _LIBUNWIND_TRACE_UNWINDING( - "unwind_phase2_forced(ex_ojb=%p): start_ip=0x%" PRIx64 - ", func=%s, lsda=0x%" PRIx64 ", personality=0x%" PRIx64, + "unwind_phase2_forced(ex_ojb=%p): start_ip=0x%" PRIxPTR + ", func=%s, lsda=0x%" PRIxPTR ", personality=0x%" PRIxPTR, (void *)exception_object, frameInfo.start_ip, functionName, frameInfo.lsda, frameInfo.handler); } |