shugo	2016-09-23 23:59:26 +0900 (Fri, 23 Sep 2016)

  New Revision: 56221

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56221

  Log:
    * vm_method.c (make_method_entry_refined): fix wrong use of ||.

  Modified files:
    trunk/ChangeLog
    trunk/vm_method.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 56220)
+++ ChangeLog	(revision 56221)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Sep 23 23:57:40 2016  Shugo Maeda  <shugo@r...>
+
+	* vm_method.c (make_method_entry_refined): fix wrong use of ||.
+
 Fri Sep 23 21:38:58 2016  Akinori MUSHA  <knu@i...>
 
 	* tool/mdoc2man.rb (Mdoc2Man#parse_macro): Add support for the
Index: vm_method.c
===================================================================
--- vm_method.c	(revision 56220)
+++ vm_method.c	(revision 56221)
@@ -447,7 +447,8 @@ make_method_entry_refined(VALUE owner, r https://github.com/ruby/ruby/blob/trunk/vm_method.c#L447
 
 	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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/