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 --- ChangeLog | 8 ++++++++ test/ruby/test_array.rb | 9 +++++++++ version.h | 6 +++--- vm_eval.c | 7 +++++-- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1df4af8dce..6f01c2b5e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Apr 14 02:13:25 2013 Marc-Andre Lafortune + + * 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] + Fri Apr 12 04:16:30 2013 Naohisa Goto * marshal.c (marshal_dump, marshal_load): workaround for segv on diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 17f2ef66c4..a8b514c830 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1918,6 +1918,15 @@ class TestArray < Test::Unit::TestCase assert_equal([['a', 5], ['b', 6]], %w(a b).zip(ary)) end + def test_zip_bug + bug8153 = "ruby-core:53650" + r = 1..1 + def r.respond_to?(*) + super + end + assert_equal [[42, 1]], [42].zip(r), bug8153 + end + def test_transpose assert_equal([[1, :a], [2, :b], [3, :c]], [[1, 2, 3], [:a, :b, :c]].transpose) diff --git a/version.h b/version.h index e2536c6826..e28abc91e4 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-04-13" -#define RUBY_PATCHLEVEL 121 +#define RUBY_RELEASE_DATE "2013-04-14" +#define RUBY_PATCHLEVEL 122 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #include "ruby/version.h" 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