diff options
| author | NARUSE, Yui <[email protected]> | 2022-12-24 02:24:55 +0900 |
|---|---|---|
| committer | <[email protected]> | 2022-12-24 02:24:55 +0900 |
| commit | ee60756495b775c4e8fc93a57094ac4e4b83fa7f () | |
| tree | f43a5ba08a2b102e27ff6b40e4d4c1c1de14386a /vm_dump.c | |
| parent | 1876cda972ea226ee85faf14dae6d047e145a4c6 (diff) | |
Fix backtrace beyond _singtramp on macOS arm64 (#7015)
* move ptrauth_strip logic into vm_dump.c * don't use _sigtramp special logic on arm64
Notes: Merged-By: nurse <[email protected]>
| -rw-r--r-- | vm_dump.c | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -496,6 +496,7 @@ backtrace(void **trace, int size) unw_getcontext(&uc); unw_init_local(&cursor, &uc); while (unw_step(&cursor) > 0) { unw_get_reg(&cursor, UNW_REG_IP, &ip); trace[n++] = (void *)ip; @@ -511,7 +512,6 @@ backtrace(void **trace, int size) darwin_sigtramp: /* darwin's bundled libunwind doesn't support signal trampoline */ { -#if defined(__x86_64__) ucontext_t *uctx; char vec[1]; int r; @@ -572,7 +572,6 @@ darwin_sigtramp: trace[n++] = (void *)ip; ip = *(unw_word_t*)uctx->uc_mcontext->MCTX_SS_REG(rsp); } -#endif trace[n++] = (void *)ip; unw_set_reg(&cursor, UNW_REG_IP, ip); @@ -582,6 +581,22 @@ darwin_sigtramp: trace[n++] = (void *)ip; } return n; } # elif defined(BROKEN_BACKTRACE) # undef USE_BACKTRACE |