From e56eea5e37a43879465d2d1d99e0e0dc89ae8684 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 15 Feb 2012 01:33:56 +0000 Subject: merge revision(s) r34564: * vm_eval.c (check_funcall): Call respond_to? with matching arity for legacy single-argument implementations. [ruby-trunk - Bug #6000] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index cfa75a46b3..6f2da3ef6f 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -274,10 +274,13 @@ check_funcall(VALUE recv, ID mid, int argc, VALUE *argv) me = rb_method_entry(klass, idRespond_to); if (me && !(me->flag & NOEX_BASIC)) { VALUE args[2]; + int arity = rb_method_entry_arity(me); + + if (arity < 1 || arity > 3) arity = 2; args[0] = ID2SYM(mid); args[1] = Qtrue; - if (!RTEST(vm_call0(th, recv, idRespond_to, 2, args, me))) { + if (!RTEST(vm_call0(th, recv, idRespond_to, arity, args, me))) { return Qundef; } } -- cgit v1.2.3