kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix backtrace to not skip frames with iseq without pc

Browse source 
Previously, frames with iseq but no pc were skipped (even before
the refactoring in 3b24b7914c).
Because the entire backtrace was procesed before the refactoring,
this was handled by using later frames instead.  However, after
the refactoring, we need to handle those frames or they get
lost.

Keep two iteration counters when iterating, one for the desired
backtrace size (so we generate the desired number of frames), and
one for the actual backtrace size (so we don't process off the end
of the stack).  When skipping over an iseq frame with no pc,
decrement the counter for the desired backtrace, so it will
continue to process the expected number of backtrace frames.

Fixes [Bug #17581]
This commit is contained in:
Jeremy Evans 2021-01-25 14:56:03 -08:00
parent 4849575932
commit 8743732621
Notes: git 2021-02-20 01:14:46 +09:00 
Merged: https://github.com/ruby/ruby/pull/4120
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/ruby/test_backtrace.rb
View file

@ -138,6 +138,18 @@ class TestBacktrace < Test::Unit::TestCase
rec[m]
end
def test_caller_with_limit
x = nil
c = Class.new do
define_method(:bar) do
x = caller(1, 1)
end
end
[c.new].group_by(&:bar)
assert_equal 1, x.length
assert_equal caller(0), caller(0, nil)
end
def test_caller_with_nil_length
assert_equal caller(0), caller(0, nil)
end

16
vm_backtrace.c
View file

@ -516,7 +516,7 @@ backtrace_each(const rb_execution_context_t *ec,
const rb_control_frame_t *last_cfp = ec->cfp;
const rb_control_frame_t *start_cfp = RUBY_VM_END_CONTROL_FRAME(ec);
const rb_control_frame_t *cfp;
ptrdiff_t size, i, last, start = 0;
ptrdiff_t size, real_size, i, j, last, start = 0;
int ret = 0;
// In the case the thread vm_stack or cfp is not initialized, there is no backtrace.
@ -540,10 +540,10 @@ backtrace_each(const rb_execution_context_t *ec,
RUBY_VM_NEXT_CONTROL_FRAME(start_cfp)); /* skip top frames */
if (start_cfp < last_cfp) {
size = last = 0;
real_size = size = last = 0;
}
else {
size = start_cfp - last_cfp + 1;
real_size = size = start_cfp - last_cfp + 1;
if (from_last > size) {
size = last = 0;
@ -569,7 +569,7 @@ backtrace_each(const rb_execution_context_t *ec,
init(arg, size);
/* SDR(); */
for (i=0, cfp = start_cfp; i<last; i++, cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp)) {
for (i=0, j=0, cfp = start_cfp; i<last && j<real_size; i++, j++, cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp)) {
if (i < start) {
if (iter_skip) {
iter_skip(arg, cfp);
@ -579,9 +579,11 @@ backtrace_each(const rb_execution_context_t *ec,
/* fprintf(stderr, "cfp: %d\n", (rb_control_frame_t *)(ec->vm_stack + ec->vm_stack_size) - cfp); */
if (cfp->iseq) {
if (cfp->pc) {
iter_iseq(arg, cfp);
}
if (cfp->pc) {
iter_iseq(arg, cfp);
} else {
i--;
}
}
else if (RUBYVM_CFUNC_FRAME_P(cfp)) {
const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);