1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable C backtraces on Apple silicon (#5770)

Browse Source 
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
This commit is contained in:
Jean byroot Boussier 2022-04-20 04:52:47 +02:00 committed by GitHub
parent d9482913a9
commit fa2df520bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-04-20 11:53:07 +09:00 
Merged-By: nurse <naruse@airemix.jp>
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vm_dump.c
View File

@ -474,7 +474,7 @@ rb_vmdebug_thread_dump_state(VALUE self)
# ifdef HAVE_LIBUNWIND # ifdef HAVE_LIBUNWIND
# undef backtrace # undef backtrace
# define backtrace unw_backtrace # define backtrace unw_backtrace
# elif defined(__APPLE__) && defined(__x86_64__) && defined(HAVE_LIBUNWIND_H) # elif defined(__APPLE__) && defined(HAVE_LIBUNWIND_H)
# define UNW_LOCAL_ONLY # define UNW_LOCAL_ONLY
# include <libunwind.h> # include <libunwind.h>
# include <sys/mman.h> # include <sys/mman.h>
@ -503,6 +503,7 @@ backtrace(void **trace, int size)
darwin_sigtramp: darwin_sigtramp:
/* darwin's bundled libunwind doesn't support signal trampoline */ /* darwin's bundled libunwind doesn't support signal trampoline */
{ {
#if defined(__x86_64__)
ucontext_t *uctx; ucontext_t *uctx;
char vec[1]; char vec[1];
int r; int r;
@ -563,6 +564,8 @@ darwin_sigtramp:
trace[n++] = (void *)ip; trace[n++] = (void *)ip;
ip = *(unw_word_t*)uctx->uc_mcontext->MCTX_SS_REG(rsp); ip = *(unw_word_t*)uctx->uc_mcontext->MCTX_SS_REG(rsp);
} }
#endif
trace[n++] = (void *)ip; trace[n++] = (void *)ip;
unw_set_reg(&cursor, UNW_REG_IP, ip); unw_set_reg(&cursor, UNW_REG_IP, ip);
} }