2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ff22013d8..bc8eda72cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 19 01:08:34 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* compile.c (NODE_RETURN): fire return event at explicit return.
+	  [ruby-dev:38701]
+
 Tue Aug 18 21:00:26 2009  Tanaka Akira  <akr@fsij.org>
 
 	* enumerator.c (enumerator_peek): new method Enumerator#peek.
diff --git a/compile.c b/compile.c
index f01b287be8..c9bc1ce8f6 100644
--- a/compile.c
+++ b/compile.c
@@ -4205,6 +4205,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 
 		if (is->type == ISEQ_TYPE_METHOD) {
 		    add_ensure_iseq(ret, iseq, 1);
+		    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
 		    ADD_INSN(ret, nd_line(node), leave);
 		    ADD_ADJUST_RESTORE(ret, splabel);