ko1	2013-02-19 08:12:25 +0900 (Tue, 19 Feb 2013)

  New Revision: 39305

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39305

  Log:
    * 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.

  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/proc.c
    branches/ruby_2_0_0/test/ruby/test_settracefunc.rb

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39304)
+++ ruby_2_0_0/ChangeLog	(revision 39305)
@@ -1,3 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Feb 19 07:51:01 2013  Koichi Sasada  <ko1@a...>
+
+	* 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  <ko1@a...>
 
 	* backport r39276 from trunk. [ruby-dev:46997] [Bug #7825]
Index: ruby_2_0_0/proc.c
===================================================================
--- ruby_2_0_0/proc.c	(revision 39304)
+++ ruby_2_0_0/proc.c	(revision 39305)
@@ -315,16 +315,24 @@ rb_binding_new_with_cfp(rb_thread_t *th, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/proc.c#L315
 {
     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);
 
Index: ruby_2_0_0/test/ruby/test_settracefunc.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_settracefunc.rb	(revision 39304)
+++ ruby_2_0_0/test/ruby/test_settracefunc.rb	(revision 39305)
@@ -942,6 +942,16 @@ class TestSetTraceFunc < Test::Unit::Tes https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_settracefunc.rb#L942
     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::Tes https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_settracefunc.rb#L979
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/