diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-16 06:51:17 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-16 06:51:17 +0000 |
commit | 7cbeff908fb75f82b08b2e7eeaed937167eef2d6 (patch) | |
tree | 89f4952dcb34e48bd655d55b645e627e194c90ce /proc.c | |
parent | 3d490d209aaa9b6ae57748dba2a5782be4aeeaf8 (diff) | |
download | ruby-7cbeff908fb75f82b08b2e7eeaed937167eef2d6.tar.gz |
* proc.c (rb_binding_new_with_cfp): create binding object even if
the frame is IFUNC. But return a ruby-level binding to keep
compatibility.
This patch fix degradation introduced from r39067.
[Bug #7774] [ruby-dev:46960]
* test/ruby/test_settracefunc.rb: add a test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -315,16 +315,24 @@ rb_binding_new_with_cfp(rb_thread_t *th, const rb_control_frame_t *src_cfp) { rb_control_frame_t *cfp = rb_vm_get_binding_creatable_next_cfp(th, src_cfp); rb_control_frame_t *ruby_level_cfp = rb_vm_get_ruby_level_next_cfp(th, src_cfp); - VALUE bindval; + VALUE bindval, envval; rb_binding_t *bind; if (cfp == 0 || ruby_level_cfp == 0) { rb_raise(rb_eRuntimeError, "Can't create Binding Object on top of Fiber."); } + while (1) { + envval = rb_vm_make_env_object(th, cfp); + if (cfp == ruby_level_cfp) { + break; + } + cfp = rb_vm_get_binding_creatable_next_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp)); + } + bindval = binding_alloc(rb_cBinding); GetBindingPtr(bindval, bind); - bind->env = rb_vm_make_env_object(th, cfp); + bind->env = envval; bind->path = ruby_level_cfp->iseq->location.path; bind->first_lineno = rb_vm_get_sourceline(ruby_level_cfp); |