From 5a121a4f0b8fb9d416566f75047a190166d98609 Mon Sep 17 00:00:00 2001 From: shugo Date: Fri, 23 Sep 2016 14:59:26 +0000 Subject: [PATCH] * vm_method.c (make_method_entry_refined): fix wrong use of ||. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ vm_method.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c8485de275..cf061c5438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 23 23:57:40 2016 Shugo Maeda + + * vm_method.c (make_method_entry_refined): fix wrong use of ||. + Fri Sep 23 21:38:58 2016 Akinori MUSHA * tool/mdoc2man.rb (Mdoc2Man#parse_macro): Add support for the diff --git a/vm_method.c b/vm_method.c index c7417de455..d5780bbe8f 100644 --- a/vm_method.c +++ b/vm_method.c @@ -447,7 +447,8 @@ make_method_entry_refined(VALUE owner, rb_method_entry_t *me) refined.orig_me = rb_method_entry_alloc(me->called_id, me->owner, - me->defined_class || owner, + me->defined_class ? + me->defined_class : owner, method_definition_addref(me->def)); METHOD_ENTRY_FLAGS_COPY(refined.orig_me, me); refined.owner = owner;