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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@56731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f7e91b433a..82a9d98f2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 12 07:48:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* cont.c (cont_new): disable optimization if clang's version is
diff --git a/proc.c b/proc.c
index 5995c9778e..3ddbe3e2e3 100644
--- a/proc.c
+++ b/proc.c
@@ -1206,7 +1206,7 @@ mnew_internal(rb_method_entry_t *me, VALUE defined_class, VALUE klass,
 	}
     }
     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;
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 35ddc87bcc..6a21ef4f69 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -856,6 +856,22 @@ class TestMethod < Test::Unit::TestCase
     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
diff --git a/version.h b/version.h
index 1e1823484c..64ab12750b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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