diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/-ext-/debug/test_profile_frames.rb | 17 | ||||
| -rw-r--r-- | vm_backtrace.c | 10 |
3 files changed, 27 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Mon Dec 21 10:18:46 2015 Kazuki Yamaguchi <k@rhe.jp> + + * vm_backtrace.c (rb_profile_frames): ignore ifunc frames as it + did before. [ruby-core:72409] [Bug #11851] + Mon Dec 21 09:33:17 2015 Karol Bucek <kares@users.noreply.github.com> * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket): fix diff --git a/test/-ext-/debug/test_profile_frames.rb b/test/-ext-/debug/test_profile_frames.rb index 860652c0cd..5ea506046e 100644 --- a/test/-ext-/debug/test_profile_frames.rb +++ b/test/-ext-/debug/test_profile_frames.rb @@ -102,4 +102,21 @@ class TestProfileFrames < Test::Unit::TestCase end } end + + def test_ifunc_frame + bug11851 = '[ruby-core:72409] [Bug #11851]' + assert_ruby_status([], <<~'end;', bug11851) # do + require '-test-/debug' + class A + include Bug::Debug + def x + profile_frames(0, 10) + end + end + def a + [A.new].each(&:x) + end + a + end; + end end diff --git a/vm_backtrace.c b/vm_backtrace.c index 4267b0dd71..bef61d81e0 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -1248,25 +1248,25 @@ rb_profile_frames(int start, int limit, VALUE *buff, int *lines) int i; rb_thread_t *th = GET_THREAD(); rb_control_frame_t *cfp = th->cfp, *end_cfp = RUBY_VM_END_CONTROL_FRAME(th); + const rb_callable_method_entry_t *cme; for (i=0; i<limit && cfp != end_cfp;) { - const rb_callable_method_entry_t *cme = rb_vm_frame_method_entry(cfp); - - if ((cme && cme->def->type == VM_METHOD_TYPE_ISEQ) || (cfp->iseq && cfp->pc)) { + if (cfp->iseq && cfp->pc) { if (start > 0) { start--; continue; } /* record frame info */ - if (cme) { + cme = rb_vm_frame_method_entry(cfp); + if (cme && cme->def->type == VM_METHOD_TYPE_ISEQ) { buff[i] = (VALUE)cme; } else { buff[i] = (VALUE)cfp->iseq; } - if (cfp->iseq && lines) lines[i] = calc_lineno(cfp->iseq, cfp->pc); + if (lines) lines[i] = calc_lineno(cfp->iseq, cfp->pc); i++; } |