usa	2016-11-12 07:52:15 +0900 (Sat, 12 Nov 2016)

  New Revision: 56731

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

  Log:
    merge revision(s) 56489: [Backport #12832]
    
    * proc.c (mnew_internal): follow the original class, not to loop
      the prepended module.  [ruby-core:77591] [Bug #12832]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/proc.c
    branches/ruby_2_2/test/ruby/test_method.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/test/ruby/test_method.rb
===================================================================
--- ruby_2_2/test/ruby/test_method.rb	(revision 56730)
+++ ruby_2_2/test/ruby/test_method.rb	(revision 56731)
@@ -856,6 +856,22 @@ class TestMethod < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_method.rb#L856
     assert_nil(m, Feature9781)
   end
 
+  def test_prepended_public_zsuper
+    mod = EnvUtil.labeled_module("Mod") {private def foo; :ok end}
+    mods = [mod]
+    obj = Object.new.extend(mod)
+    class << obj
+      public :foo
+    end
+    2.times do |i|
+      mods.unshift(mod = EnvUtil.labeled_module("Mod#{i}") {def foo; end})
+      obj.singleton_class.prepend(mod)
+    end
+    m = obj.method(:foo)
+    assert_equal(mods, mods.map {m.owner.tap {m = m.super_method}})
+    assert_nil(m)
+  end
+
   def rest_parameter(*rest)
     rest
   end
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 56730)
+++ ruby_2_2/version.h	(revision 56731)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-11-12"
-#define RUBY_PATCHLEVEL 389
+#define RUBY_PATCHLEVEL 390
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 11
Index: ruby_2_2/proc.c
===================================================================
--- ruby_2_2/proc.c	(revision 56730)
+++ ruby_2_2/proc.c	(revision 56731)
@@ -1206,7 +1206,7 @@ mnew_internal(rb_method_entry_t *me, VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_2/proc.c#L1206
 	}
     }
     if (def && def->type == VM_METHOD_TYPE_ZSUPER) {
-	klass = RCLASS_SUPER(defined_class);
+	klass = RCLASS_SUPER(RCLASS_ORIGIN(defined_class));
 	id = def->original_id;
 	me = rb_method_entry_without_refinements(klass, id, &defined_class);
 	goto again;
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 56730)
+++ ruby_2_2/ChangeLog	(revision 56731)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Nov 12 07:48:07 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* proc.c (mnew_internal): follow the original class, not to loop
+	  the prepended module.  [ruby-core:77591] [Bug #12832]
+
 Sat Nov 12 07:47:19 2016  Shugo Maeda  <shugo@r...>
 
 	* cont.c (cont_new): disable optimization if clang's version is

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56489


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