From ee60756495b775c4e8fc93a57094ac4e4b83fa7f Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Sat, 24 Dec 2022 02:24:55 +0900 Subject: Fix backtrace beyond _singtramp on macOS arm64 (#7015) * move ptrauth_strip logic into vm_dump.c * don't use _sigtramp special logic on arm64 --- addr2line.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'addr2line.c') 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; -- cgit v1.2.1