From 885f2da83b8a47a1833cbcfb78fe345ff950341d Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 18 Feb 2013 23:12:25 +0000 Subject: * backport r39275 from trunk. [ruby-dev:46994] [Bug #7774] * 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/branches/ruby_2_0_0@39305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++++++++ proc.c | 12 ++++++++++-- test/ruby/test_settracefunc.rb | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6029f2ff9..b1473943e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Feb 19 07:51:01 2013 Koichi Sasada + + * backport r39275 from trunk. [ruby-dev:46994] [Bug #7774] + + * 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. + Sat Feb 16 20:43:43 2013 Koichi Sasada * backport r39276 from trunk. [ruby-dev:46997] [Bug #7825] diff --git a/proc.c b/proc.c index 21fd22d95e..7e90ab6e2a 100644 --- a/proc.c +++ b/proc.c @@ -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); diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index b4143c602c..b010846b92 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -942,6 +942,16 @@ class TestSetTraceFunc < Test::Unit::TestCase assert_security_error_safe4(func) end + def m1_for_test_trace_point_binding_in_ifunc(arg) + arg + nil + rescue + end + + def m2_for_test_trace_point_binding_in_ifunc(arg) + arg.inject(:+) + rescue + end + def test_trace_point_binding_in_ifunc bug7774 = '[ruby-dev:46908]' src = %q{ @@ -969,5 +979,32 @@ class TestSetTraceFunc < Test::Unit::TestCase rescue RuntimeError end }, bug7774 + + # TracePoint + tp_b = nil + TracePoint.new(:raise) do |tp| + tp_b = tp.binding + end.enable do + m1_for_test_trace_point_binding_in_ifunc(0) + assert_equal(self, eval('self', tp_b), '[ruby-dev:46960]') + + m2_for_test_trace_point_binding_in_ifunc([0, nil]) + assert_equal(self, eval('self', tp_b), '[ruby-dev:46960]') + end + + # set_trace_func + stf_b = nil + set_trace_func ->(event, file, line, id, binding, klass) do + stf_b = binding if event == 'raise' + end + begin + m1_for_test_trace_point_binding_in_ifunc(0) + assert_equal(self, eval('self', stf_b), '[ruby-dev:46960]') + + m2_for_test_trace_point_binding_in_ifunc([0, nil]) + assert_equal(self, eval('self', stf_b), '[ruby-dev:46960]') + ensure + set_trace_func(nil) + end end end -- cgit v1.2.3