diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-05 03:18:25 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-05 03:18:25 +0000 |
commit | 55148a250101b662fde32919f14afcf2dcdc801d (patch) | |
tree | fc5c632f160f695dabc3579a58b4fb188fd7e190 /vm_eval.c | |
parent | 2205687ccf6caf2d7b9998478751508afba707c6 (diff) |
* vm_eval.c (check_funcall): try respond_to? first if redefined.
[Bug #5158]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -203,7 +203,7 @@ stack_check(void) } static inline rb_method_entry_t *rb_search_method_entry(VALUE recv, ID mid); -static inline int rb_method_call_status(rb_thread_t *th, rb_method_entry_t *me, call_type scope, VALUE self); +static inline int rb_method_call_status(rb_thread_t *th, const rb_method_entry_t *me, call_type scope, VALUE self); #define NOEX_OK NOEX_NOSUPER /*! @@ -265,10 +265,19 @@ check_funcall_failed(struct rescue_funcall_args *args, VALUE e) static VALUE check_funcall(VALUE recv, ID mid, int argc, VALUE *argv) { - rb_method_entry_t *me = rb_search_method_entry(recv, mid); + const rb_method_entry_t *me = rb_method_entry(CLASS_OF(recv), idRespond_to); rb_thread_t *th = GET_THREAD(); - int call_status = rb_method_call_status(th, me, CALL_FCALL, Qundef); + int call_status; + + if (me && !(me->flag & NOEX_BASIC)) { + VALUE args[2] = {ID2SYM(mid), Qtrue}; + if (!RTEST(vm_call0(th, recv, idRespond_to, 2, args, me))) { + return Qundef; + } + } + me = rb_search_method_entry(recv, mid); + call_status = rb_method_call_status(th, me, CALL_FCALL, Qundef); if (call_status != NOEX_OK) { if (rb_method_basic_definition_p(CLASS_OF(recv), idMethodMissing)) { return Qundef; @@ -375,7 +384,7 @@ rb_search_method_entry(VALUE recv, ID mid) } static inline int -rb_method_call_status(rb_thread_t *th, rb_method_entry_t *me, call_type scope, VALUE self) +rb_method_call_status(rb_thread_t *th, const rb_method_entry_t *me, call_type scope, VALUE self) { VALUE klass; ID oid; |