merge revision(s) d8a13e504992a45d52063f7c925408d7aad3595a: [Backport #17780]

	[Bug #17780] Fix Method#super_method for module alias

	Method#super_method crashes for aliased module methods because they are
	not defined on a class. This bug was introduced in
	c60aaed1856b2b6f90de0992c34771830019e021 as part of bug #17130.
	---
	 proc.c                   |  2 +-
	 test/ruby/test_method.rb | 13 +++++++++++++
	 2 files changed, 14 insertions(+), 1 deletion(-)

1 files changed, 13 insertions, 0 deletions

diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index cc7421b700..240821c9e2 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -1168,6 +1168,19 @@ class TestMethod < Test::Unit::TestCase
     assert_nil(m.super_method)
   end
 
+  # Bug 17780
+  def test_super_method_module_alias
+    m = Module.new do
+      def foo
+      end
+      alias :f :foo
+    end
+
+    method = m.instance_method(:f)
+    super_method = method.super_method
+    assert_nil(super_method)
+  end
+
   def rest_parameter(*rest)
     rest
   end