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

[Bug #21150] macOS: unwinding coroutine workaround is only for arm64

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2025-04-05 10:29:58 +09:00
parent 085cc6e434
commit 229784d160
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2025-04-05 03:21:35 +00:00 
Merged: https://github.com/ruby/ruby/pull/13072
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vm_dump.c
View File

@ -511,6 +511,7 @@ rb_vmdebug_thread_dump_state(FILE *errout, VALUE self)
# include <sys/mman.h> # include <sys/mman.h>
# undef backtrace # undef backtrace
# if defined(__arm64__)
static bool static bool
is_coroutine_start(unw_word_t ip) is_coroutine_start(unw_word_t ip)
{ {
@ -518,6 +519,7 @@ is_coroutine_start(unw_word_t ip)
extern void ruby_coroutine_start(struct coroutine_context *, struct coroutine_context *); extern void ruby_coroutine_start(struct coroutine_context *, struct coroutine_context *);
return ((void *)(ip) == (void *)ruby_coroutine_start); return ((void *)(ip) == (void *)ruby_coroutine_start);
} }
# endif
int int
backtrace(void **trace, int size) backtrace(void **trace, int size)
@ -614,7 +616,7 @@ darwin_sigtramp:
} }
return n; return n;
# else /* defined(__arm64__) */ # elif defined(__arm64__)
/* Since Darwin arm64's _sigtramp is implemented as normal function, /* Since Darwin arm64's _sigtramp is implemented as normal function,
* unwind can unwind frames without special code. * unwind can unwind frames without special code.
* https://github.com/apple/darwin-libplatform/blob/215b09856ab5765b7462a91be7076183076600df/src/setjmp/generic/sigtramp.c * https://github.com/apple/darwin-libplatform/blob/215b09856ab5765b7462a91be7076183076600df/src/setjmp/generic/sigtramp.c
@ -631,6 +633,8 @@ darwin_sigtramp:
if (is_coroutine_start(ip)) break; if (is_coroutine_start(ip)) break;
} }
return n; return n;
# else
# error unsupported architecture
# endif # endif
} }
# elif defined(BROKEN_BACKTRACE) # elif defined(BROKEN_BACKTRACE)