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

Fix use of the rb_profile_frames start parameter

Browse Source 
Previously, it was decrementing the start argument until it reached
zero without actually changing the control frame pointer.

[Bug #14607]
This commit is contained in:
Dylan Thacker-Smith 2019-09-27 01:10:13 -04:00 committed by Jeremy Evans
parent e81a5453e3
commit 2b96737636
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/-ext-/debug/test_profile_frames.rb
View File

@ -236,4 +236,8 @@ class TestProfileFrames < Test::Unit::TestCase
a a
end; end;
end end
def test_start
assert_equal Bug::Debug.profile_frames(0, 10).tap(&:shift), Bug::Debug.profile_frames(1, 9)
end
end end

7
vm_backtrace.c
View File

@ -1593,7 +1593,7 @@ thread_profile_frames(rb_execution_context_t *ec, int start, int limit, VALUE *b
// Skip dummy frame; see `rb_ec_partial_backtrace_object` for details // Skip dummy frame; see `rb_ec_partial_backtrace_object` for details
end_cfp = RUBY_VM_NEXT_CONTROL_FRAME(end_cfp); end_cfp = RUBY_VM_NEXT_CONTROL_FRAME(end_cfp);
for (i=0; i<limit && cfp != end_cfp;) { for (i=0; i<limit && cfp != end_cfp; cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp)) {
if (VM_FRAME_RUBYFRAME_P(cfp) && cfp->pc != 0) { if (VM_FRAME_RUBYFRAME_P(cfp) && cfp->pc != 0) {
if (start > 0) { if (start > 0) {
start--; start--;
@ -1627,12 +1627,15 @@ thread_profile_frames(rb_execution_context_t *ec, int start, int limit, VALUE *b
else { else {
cme = rb_vm_frame_method_entry(cfp); cme = rb_vm_frame_method_entry(cfp);
if (cme && cme->def->type == VM_METHOD_TYPE_CFUNC) { if (cme && cme->def->type == VM_METHOD_TYPE_CFUNC) {
if (start > 0) {
start--;
continue;
}
buff[i] = (VALUE)cme; buff[i] = (VALUE)cme;
if (lines) lines[i] = 0; if (lines) lines[i] = 0;
i++; i++;
} }
} }
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
} }
return i; return i;