Fix backtrace beyond _singtramp on macOS arm64 (#7015)

* move ptrauth_strip logic into vm_dump.c
* don't use _sigtramp special logic on arm64

2 files changed, 17 insertions, 11 deletions

diff --git a/addr2line.c b/addr2line.c
index 77538f6eb9..f7d5b0239b 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -2549,15 +2549,6 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
     /* 2 is NULL + main executable */
     void **dladdr_fbases = (void **)calloc(num_traces+2, sizeof(void *));
 
-#if defined(__APPLE__) && defined(__aarch64__)
-    // Strip Arm64's pointer authentication.
-    for (i = 0; i < num_traces; i++) {
-        // I wish I could use "ptrauth_strip()" but I get an error:
-        // "this target does not support pointer authentication"
-        traces[i] = (void*)(((uint64_t)traces[i]) & 0x7fffffffffffull);
-    }
-#endif
-
 #ifdef HAVE_MAIN_EXE_PATH
     char *main_path = NULL; /* used on printing backtrace */
     ssize_t len;
diff --git a/vm_dump.c b/vm_dump.c
index 93179fedc8..e31d70c0e1 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -496,6 +496,7 @@ backtrace(void **trace, int size)
 
     unw_getcontext(&uc);
     unw_init_local(&cursor, &uc);
+#  if defined(__x86_64__)
     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;
+
+#  else /* defined(__arm64__) */
+    /* Since Darwin arm64's _sigtramp is implemented as normal function,
+     * unwind can unwind frames without special code.
+     * https://github.com/apple/darwin-libplatform/blob/215b09856ab5765b7462a91be7076183076600df/src/setjmp/generic/sigtramp.c
+     */
+    while (unw_step(&cursor) > 0) {
+        unw_get_reg(&cursor, UNW_REG_IP, &ip);
+        // Strip Arm64's pointer authentication.
+        // https://developer.apple.com/documentation/security/preparing_your_app_to_work_with_pointer_authentication
+        // I wish I could use "ptrauth_strip()" but I get an error:
+        // "this target does not support pointer authentication"
+        trace[n++] = (void *)(ip & 0x7fffffffffffull);
+    }
+    return n;
+#  endif
 }
 # elif defined(BROKEN_BACKTRACE)
 #  undef USE_BACKTRACE