From c5dad98c41a720a15c9dcc96d3df570cd9e23df3 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 7 Jul 2015 02:52:34 +0000 Subject: [PATCH] * proc.c (rb_method_call): because data->me should be non-NULL, do not check data->me * proc.c (method_inspect): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ proc.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a22b7d5f96..a6dbcc3b7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Jul 7 11:45:14 2015 Koichi Sasada + + * proc.c (rb_method_call): because data->me should be non-NULL, + do not check data->me + + * proc.c (method_inspect): ditto. + Tue Jul 7 11:37:25 2015 Koichi Sasada * vm_core.h: remove rb_iseq_t::orig because rb_iseq_clone() diff --git a/proc.c b/proc.c index 51c3436825..6c17f27848 100644 --- a/proc.c +++ b/proc.c @@ -1848,7 +1848,7 @@ rb_method_call(int argc, const VALUE *argv, VALUE method) static const rb_callable_method_entry_t * method_callable_method_entry(struct METHOD *data) { - if (data->me && data->me->defined_class == 0) rb_bug("method_callable_method_entry: not callable."); + if (data->me->defined_class == 0) rb_bug("method_callable_method_entry: not callable."); return (const rb_callable_method_entry_t *)data->me; } @@ -2324,7 +2324,7 @@ method_inspect(VALUE method) mklass = data->klass; - if (data->me && data->me->def->type == VM_METHOD_TYPE_ALIAS) { + if (data->me->def->type == VM_METHOD_TYPE_ALIAS) { defined_class = data->me->def->body.alias.original_me->owner; } else {