summaryrefslogtreecommitdiff
path: root/vm_method.c
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-23 14:59:26 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-23 14:59:26 +0000
commit5a121a4f0b8fb9d416566f75047a190166d98609 (patch)
tree06639f7bad03c090649dfd994b34aad222140990 /vm_method.c
parentb212dd66746f274fa15b2824bcd7b14a72837f46 (diff)
* 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
Diffstat (limited to 'vm_method.c')
-rw-r--r--vm_method.c3
1 files changed, 2 insertions, 1 deletions
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;