diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-15 16:14:32 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-15 16:14:32 +0000 |
| commit | 113d3599caa41605e54be08b84a9403adcdebc0c (patch) | |
| tree | 2e3f6d889e24618d9d248c396254fbc86ccc799f /compile.c | |
| parent | e5633967eac299edab650bc77edfcebf3f2bd871 (diff) | |
merge revision(s) 41300: [Backport #8489]
* 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/branches/ruby_2_0_0@41319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compile.c')
| -rw-r--r-- | compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -483,8 +483,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); |