* compile.c (rb_iseq_compile_node): fix location of a `trace'

  instruction (b_return event).
  [ruby-core:55305] [ruby-trunk - Bug #8489]
  (need a backport to 2.0.0?)
* test/ruby/test_settracefunc.rb: add a test.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 23 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 34bcd2396b..f18d6f7284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jun 14 18:52:51 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (rb_iseq_compile_node): fix location of a `trace'
+	  instruction (b_return event).
+	  [ruby-core:55305] [ruby-trunk - Bug #8489]
+	  (need a backport to 2.0.0?)
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
 Fri Jun 14 18:18:07 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* class.c, include/ruby/ruby.h: add write barriers for T_CLASS,
diff --git a/compile.c b/compile.c
index 0bbb770885..bfbd61db82 100644
--- a/compile.c
+++ b/compile.c
@@ -482,8 +482,8 @@ rb_iseq_compile_node(VALUE self, NODE *node)
 		ADD_LABEL(ret, start);
 		ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_B_CALL);
 		COMPILE(ret, "block body", node->nd_body);
-		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN);
 		ADD_LABEL(ret, end);
+		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN);
 
 		/* wide range catch handler must put at last */
 		ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start);
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index ab1a37f8eb..4319c8fc75 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -953,4 +953,17 @@ class TestSetTraceFunc < Test::Unit::TestCase
       set_trace_func(nil)
     end
   end
+
+  def test_tracepoint_b_return_with_next
+    n = 0
+    TracePoint.new(:b_return){
+      n += 1
+    }.enable{
+      3.times{
+        next
+      } # 3 times b_retun
+    }   # 1 time b_return
+
+    assert_equal 4, n
+  end
 end