diff options
| author | Ivo Anjo <ivo.anjo@datadoghq.com> | 2022-07-11 14:51:44 +0100 |
|---|---|---|
| committer | Yusuke Endoh <mame@ruby-lang.org> | 2022-07-26 10:43:44 +0900 |
| commit | 649bfbe00d8032fa2c0536e596a284f69926e87f (patch) | |
| tree | 099c44d7ccbf253380d254e0e2b7eb5d9ec19bb1 /vm_backtrace.c | |
| parent | cc29b43c7a8079c0c9e308f049390dfaab5acbd9 (diff) | |
| download | ruby-649bfbe00d8032fa2c0536e596a284f69926e87f.tar.gz | |
Fix `rb_profile_frames` output includes dummy main thread frame
The `rb_profile_frames` API did not skip the two dummy frames that
each thread has at its beginning. This was unlike `backtrace_each` and
`rb_ec_parcial_backtrace_object`, which do skip them.
This does not seem to be a problem for non-main thread frames,
because both `VM_FRAME_RUBYFRAME_P(cfp)` and
`rb_vm_frame_method_entry(cfp)` are NULL for them.
BUT, on the main thread `VM_FRAME_RUBYFRAME_P(cfp)` was true
and thus the dummy thread was still included in the output of
`rb_profile_frames`.
I've now made `rb_profile_frames` skip this extra frame (like
`backtrace_each` and friends), as well as add a test that asserts
the size and contents of `rb_profile_frames`.
Fixes [Bug #18907] (<https://bugs.ruby-lang.org/issues/18907>)
Diffstat (limited to 'vm_backtrace.c')
| -rw-r--r-- | vm_backtrace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vm_backtrace.c b/vm_backtrace.c index ee749deb14..5bd588df12 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -1551,6 +1551,9 @@ rb_profile_frames(int start, int limit, VALUE *buff, int *lines) const rb_control_frame_t *cfp = ec->cfp, *end_cfp = RUBY_VM_END_CONTROL_FRAME(ec); const rb_callable_method_entry_t *cme; + // Skip dummy frame; see `rb_ec_partial_backtrace_object` for details + end_cfp = RUBY_VM_NEXT_CONTROL_FRAME(end_cfp); + for (i=0; i<limit && cfp != end_cfp;) { if (VM_FRAME_RUBYFRAME_P(cfp)) { if (start > 0) { |