From 59f8d5d103948dc1628dc220677f0bf2ebe22493 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 13 Apr 2013 17:19:57 +0000 Subject: merge revision(s) 39877,39881: [Backport #8153] [Backport #8154] * array.c: Avoid zip bug by not using obsolete rb_check_block_call [Bug #8153] * vm_eval.c (check_funcall_respond_to): preserve passed_block, which is modified in vm_call0_body() via vm_call0(), and caused a bug of rb_check_funcall() by false negative result of rb_block_given_p(). re-fix [ruby-core:53650] [Bug #8153]. [ruby-core:53653] [Bug #8154] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index 296af8cfe7..a52ab21e81 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -358,7 +358,8 @@ check_funcall_respond_to(rb_thread_t *th, VALUE klass, VALUE recv, ID mid) const rb_method_entry_t *me = rb_method_entry(klass, idRespond_to, &defined_class); if (me && !(me->flag & NOEX_BASIC)) { - VALUE args[2]; + const rb_block_t *passed_block = th->passed_block; + VALUE args[2], result; int arity = rb_method_entry_arity(me); if (arity > 2) @@ -368,7 +369,9 @@ check_funcall_respond_to(rb_thread_t *th, VALUE klass, VALUE recv, ID mid) args[0] = ID2SYM(mid); args[1] = Qtrue; - if (!RTEST(vm_call0(th, recv, idRespond_to, arity, args, me, defined_class))) { + result = vm_call0(th, recv, idRespond_to, arity, args, me, defined_class); + th->passed_block = passed_block; + if (!RTEST(result)) { return FALSE; } } -- cgit v1.2.3