From e0ad353fe0419b642fd1f6070e8527b61cb0e4ed Mon Sep 17 00:00:00 2001 From: matz Date: Sun, 30 May 2010 17:20:15 +0000 Subject: [PATCH] * insns.def (defined): respond_to_missing? may not be available (for BasicObject instances). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ insns.def | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18fa6b62d3..2616a46241 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon May 31 02:17:54 2010 Yukihiro Matsumoto + + * insns.def (defined): respond_to_missing? may not be available + (for BasicObject instances). + Mon May 31 01:43:42 2010 Marc-Andre Lafortune * lib/delegate: Delegator: combine (public|protected) methods with diff --git a/insns.def b/insns.def index 23c0143907..f75007dca2 100644 --- a/insns.def +++ b/insns.def @@ -799,8 +799,15 @@ defined } } } - if (RTEST(rb_funcall(v, rb_intern("respond_to_missing?"), 2, obj, Qfalse))) - expr_type = "method"; + { + VALUE args[2]; + VALUE r; + + args[0] = obj; args[1] = Qfalse; + r = rb_check_funcall(v, rb_intern("respond_to_missing?"), 2, args); + if (r != Qundef && RTEST(r)) + expr_type = "method"; + } break; } case DEFINED_YIELD: