* eval.c (rb_call0): "return" event hook should be always executed

  if event_hooks is set.  fixed: [ruby-core:04662]
  (backported from HEAD)


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

1 files changed, 1 insertions, 3 deletions

diff --git a/eval.c b/eval.c
index e8c4a9d963..c36180c282 100644
--- a/eval.c
+++ b/eval.c
@@ -5637,7 +5637,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 	    int state;
 	    VALUE *local_vars;	/* OK */
 	    NODE *saved_cref = 0;
-	    int hook_return = 0;
 
 	    PUSH_SCOPE();
 
@@ -5733,7 +5732,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 
 		if (event_hooks) {
 		    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
-		    hook_return = 1;
 		}
 		result = rb_eval(recv, body);
 	    }
@@ -5746,7 +5744,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
 	    POP_CLASS();
 	    POP_SCOPE();
 	    ruby_cref = saved_cref;
-	    if (hook_return) {
+	    if (event_hooks) {
 		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
 	    }
 	    switch (state) {