rubinius · Jul 22, 2015 · Jul 22, 2015
diff --git a/kernel/common/method.rb b/kernel/common/method.rb
@@ -158,6 +158,20 @@ def unbind
     UnboundMethod.new(@defined_in, @executable, @receiver.class, @name)
   end
 
+  def super_method
+    superclass = @defined_in.direct_superclass
+
+    if superclass
+      mod, entry = superclass.lookup_method(@name)
+
+      if entry && entry.visibility != :undef
+        return Method.new(@receiver, superclass, entry.method, @name)
+      end
+    end
+
+    return nil
+  end
+
 end
 
 ##
@@ -288,4 +302,18 @@ def owner
       @defined_in
     end
   end
+
+  def super_method
+    superclass = @defined_in.direct_superclass
+
+    if superclass
+      mod, entry = superclass.lookup_method(@name)
+
+      if entry && entry.visibility != :undef
+        return UnboundMethod.new(superclass, entry.method, @defined_in, @name)
+      end
+    end
+
+    return nil
+  end
 end
diff --git a/spec/ruby/core/method/super_method_spec.rb b/spec/ruby/core/method/super_method_spec.rb
@@ -22,4 +22,18 @@
     sss_meth.receiver.should == obj
     sss_meth.name.should == :overridden
   end
+
+  it "returns nil when there's no super method in the parent" do
+    method = Object.new.method(:method)
+    method.super_method.should == nil
+  end
+
+  it "returns nil when the parent's method is removed" do
+    object = MethodSpecs::B.new
+    method = object.method(:overridden)
+
+    MethodSpecs::A.class_eval { undef :overridden }
+
+    method.super_method.should == nil
+  end
 end
diff --git a/spec/ruby/core/unboundmethod/fixtures/classes.rb b/spec/ruby/core/unboundmethod/fixtures/classes.rb
@@ -73,7 +73,7 @@ class A
     def baz(a, b)
       return [__FILE__, self.class]
     end
-    def overriden; end
+    def overridden; end
   end
 
   class B < A

diff --git a/spec/ruby/core/unboundmethod/super_method_spec.rb b/spec/ruby/core/unboundmethod/super_method_spec.rb
@@ -9,4 +9,18 @@
     meth = meth.super_method
     meth.should == UnboundMethodSpecs::A.instance_method(:overridden)
   end
+
+  it "returns nil when there's no super method in the parent" do
+    method = Object.instance_method(:method)
+    method.super_method.should == nil
+  end
+
+  it "returns nil when the parent's method is removed" do
+    object = UnboundMethodSpecs::B
+    method = object.instance_method(:overridden)
+
+    UnboundMethodSpecs::A.class_eval { undef :overridden }
+
+    method.super_method.should == nil
+  end
 end
diff --git a/spec/tags/ruby/core/method/super_method_tags.txt b/spec/tags/ruby/core/method/super_method_tags.txt
diff --git a/spec/tags/ruby/core/unboundmethod/super_method_tags.txt b/spec/tags/ruby/core/unboundmethod/super_method_tags.txt