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

vm_backtrace.c: ignore ifunc frames

Browse source 
* vm_backtrace.c (rb_profile_frames): ignore ifunc frames as it
  did before.  [ruby-core:72409] [Bug #11851]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-21 01:18:48 +00:00
parent 8ec531ba9c
commit cc52f511b1
3 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

17
test/-ext-/debug/test_profile_frames.rb
View file

@ -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

10
vm_backtrace.c
View file

@ -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++;
}