nobu	2015-12-30 09:58:58 +0900 (Wed, 30 Dec 2015)

  New Revision: 53380

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

  Log:
    object.c: fix prepend cmp
    
    * object.c (rb_class_inherited_p): search the corresponding
      ancestor to prepended module from prepending class itself.
      [ruby-core:72493] [Bug #11878]

  Modified files:
    trunk/ChangeLog
    trunk/object.c
    trunk/test/ruby/test_module.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53379)
+++ ChangeLog	(revision 53380)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Dec 30 09:58:56 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* object.c (rb_class_inherited_p): search the corresponding
+	  ancestor to prepended module from prepending class itself.
+	  [ruby-core:72493] [Bug #11878]
+
 Wed Dec 30 09:20:00 2015  Yuki Kurihara  <co000ri@g...>
 
 	* test/stringio/test_io.rb (test_flag): add assertion for error when
Index: object.c
===================================================================
--- object.c	(revision 53379)
+++ object.c	(revision 53380)
@@ -1549,18 +1549,15 @@ rb_mod_eqq(VALUE mod, VALUE arg) https://github.com/ruby/ruby/blob/trunk/object.c#L1549
 VALUE
 rb_class_inherited_p(VALUE mod, VALUE arg)
 {
-    VALUE start = mod;
-
     if (mod == arg) return Qtrue;
     if (!CLASS_OR_MODULE_P(arg) && !RB_TYPE_P(arg, T_ICLASS)) {
 	rb_raise(rb_eTypeError, "compared with non class/module");
     }
-    arg = RCLASS_ORIGIN(arg);
-    if (class_search_ancestor(mod, arg)) {
+    if (class_search_ancestor(mod, RCLASS_ORIGIN(arg))) {
 	return Qtrue;
     }
     /* not mod < arg; check if mod > arg */
-    if (class_search_ancestor(arg, start)) {
+    if (class_search_ancestor(arg, mod)) {
 	return Qfalse;
     }
     return Qnil;
Index: test/ruby/test_module.rb
===================================================================
--- test/ruby/test_module.rb	(revision 53379)
+++ test/ruby/test_module.rb	(revision 53380)
@@ -1566,6 +1566,12 @@ class TestModule < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_module.rb#L1566
     end
   end
 
+  def test_prepend_CMP
+    bug11878 = '[ruby-core:72493] [Bug #11878]'
+    assert_equal(-1, C1 <=> M2)
+    assert_equal(+1, M2 <=> C1, bug11878)
+  end
+
   def test_prepend_inheritance
     bug6654 = '[ruby-core:45914]'
     a = labeled_module("a")

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