diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-23 14:59:26 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-23 14:59:26 +0000 |
| commit | 3ec9b5403b499dbfaf717fd20cff536fbfa1367a (patch) | |
| tree | 06639f7bad03c090649dfd994b34aad222140990 | |
| parent | d02ec20e3fd7550af1d6df2ee4839223d9fd9a15 (diff) | |
| download | ruby-3ec9b5403b499dbfaf717fd20cff536fbfa1367a.tar.gz | |
* 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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | vm_method.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Fri Sep 23 23:57:40 2016 Shugo Maeda <shugo@ruby-lang.org> + + * vm_method.c (make_method_entry_refined): fix wrong use of ||. + Fri Sep 23 21:38:58 2016 Akinori MUSHA <knu@iDaemons.org> * 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; |