fix for method and unbound method super_method method

evaniainbrooks · evaniainbrooks · commit dceb22eb66bf · 2022-09-09T22:46:12.000-03:00
diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
@@ -16,7 +16,7 @@
  * Copyright (C) 2002 Anders Bengtsson <ndrsbngtssn@yahoo.se>
  * Copyright (C) 2004 Charles O Nutter <headius@headius.com>
  * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
- * 
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -38,6 +38,7 @@
 import org.jruby.internal.runtime.methods.DelegatingDynamicMethod;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.IRMethodArgs;
+import org.jruby.internal.runtime.methods.PartialDelegatingMethod;
 import org.jruby.internal.runtime.methods.ProcMethod;
 import org.jruby.runtime.ArgumentDescriptor;
 import org.jruby.runtime.Block;
@@ -51,13 +52,13 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.callsite.CacheEntry;
 
-/** 
+/**
  * The RubyMethod class represents a RubyMethod object.
- * 
+ *
  * You can get such a method by calling the "method" method of an object.
- * 
+ *
  * Note: This was renamed from Method.java
- * 
+ *
  * @author  jpetersen
  * @since 0.2.3
  */
@@ -70,7 +71,7 @@ protected RubyMethod(Ruby runtime, RubyClass rubyClass) {
     }
 
     /** Create the RubyMethod class and add it to the Ruby runtime.
-     * 
+     *
      */
     public static RubyClass createMethodClass(Ruby runtime) {
         // TODO: NOT_ALLOCATABLE_ALLOCATOR is probably ok here. Confirm. JRUBY-415
@@ -81,7 +82,7 @@ public static RubyClass createMethodClass(Ruby runtime) {
 
         methodClass.defineAnnotatedMethods(AbstractRubyMethod.class);
         methodClass.defineAnnotatedMethods(RubyMethod.class);
-        
+
         return methodClass;
     }
 
@@ -108,7 +109,7 @@ public static RubyMethod newMethod(
     }
 
     /** Call the method.
-     * 
+     *
      */
     @JRubyMethod(name = {"call", "[]"})
     public IRubyObject call(ThreadContext context, Block block) {
@@ -132,7 +133,7 @@ public IRubyObject call(ThreadContext context, IRubyObject[] args, Block block)
     }
 
     /** Returns the number of arguments a method accepted.
-     * 
+     *
      * @return the number of arguments of a method.
      */
     @JRubyMethod
@@ -206,7 +207,7 @@ public RubyMethod rbClone() {
     }
 
     /** Create a Proc object.
-     * 
+     *
      */
     @JRubyMethod
     public IRubyObject to_proc(ThreadContext context) {
@@ -225,19 +226,19 @@ public IRubyObject to_proc(ThreadContext context) {
         body = new MethodBlockBody(runtime.getStaticScopeFactory().getDummyScope(), signature, entry, argsDesc,
                 receiver, originModule, originName, getFilename(), line == -1 ? -1 : line - 1);
         Block b = MethodBlockBody.createMethodBlock(body);
-        
+
         return RubyProc.newProc(runtime, b, Block.Type.LAMBDA);
     }
 
     @JRubyMethod
     public RubyUnboundMethod unbind() {
         RubyUnboundMethod unboundMethod =
-        	RubyUnboundMethod.newUnboundMethod(implementationModule, methodName, originModule, originName, entry);
+          RubyUnboundMethod.newUnboundMethod(implementationModule, methodName, originModule, originName, entry);
         unboundMethod.infectBy(this);
-        
+
         return unboundMethod;
     }
-    
+
     @JRubyMethod(name = {"inspect", "to_s"})
     @Override
     public IRubyObject inspect() {
@@ -246,7 +247,7 @@ public IRubyObject inspect() {
 
         RubyString str = RubyString.newString(runtime, "#<");
         String sharp = "#";
-        
+
         str.catString(getType().getName()).catString(": ");
 
         RubyModule definedClass;
@@ -347,7 +348,19 @@ public IRubyObject curry(ThreadContext context, IRubyObject[] args) {
 
     @JRubyMethod
     public IRubyObject super_method(ThreadContext context) {
-        return super_method(context, receiver, sourceModule.getSuperClass());
+        RubyModule superClass = null;
+        if (method instanceof PartialDelegatingMethod) {
+            PartialDelegatingMethod delegate = (PartialDelegatingMethod)method;
+            RubyModule definedClass = delegate.getRealMethod().getDefinedClass();
+            RubyModule module = definedClass.findImplementer(sourceModule.getDelegate());
+
+            if (module != null) {
+                superClass = module.getSuperClass();
+            }
+        } else {
+            superClass = sourceModule.getSuperClass();
+        }
+        return super_method(context, receiver, superClass);
     }
 
     @JRubyMethod
diff --git a/core/src/main/java/org/jruby/RubyUnboundMethod.java b/core/src/main/java/org/jruby/RubyUnboundMethod.java
@@ -13,7 +13,7 @@
  *
  * Copyright (C) 2004 Charles O Nutter <headius@headius.com>
  * Copyright (C) 2004 Stefan Matthias Aust <sma@3plus4.de>
- * 
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -32,6 +32,7 @@
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyClass;
 import org.jruby.internal.runtime.methods.DynamicMethod;
+import org.jruby.internal.runtime.methods.PartialDelegatingMethod;
 import org.jruby.internal.runtime.methods.ProcMethod;
 import org.jruby.runtime.ClassIndex;
 import org.jruby.runtime.ObjectAllocator;
@@ -71,7 +72,7 @@ public static RubyUnboundMethod newUnboundMethod(
     }
 
     public static RubyClass defineUnboundMethodClass(Ruby runtime) {
-        RubyClass newClass = 
+        RubyClass newClass =
         	runtime.defineClass("UnboundMethod", runtime.getObject(), ObjectAllocator.NOT_ALLOCATABLE_ALLOCATOR);
 
         newClass.setClassIndex(ClassIndex.UNBOUNDMETHOD);
@@ -116,9 +117,9 @@ public int hashCode() {
     @JRubyMethod
     public RubyMethod bind(ThreadContext context, IRubyObject aReceiver) {
         RubyClass receiverClass = aReceiver.getMetaClass();
-        
+
         receiverClass.checkValidBindTargetFrom(context, (RubyModule) owner(context), true);
-        
+
         return RubyMethod.newMethod(implementationModule, methodName, receiverClass, originName, entry, aReceiver);
     }
 
@@ -159,7 +160,20 @@ public IRubyObject inspect() {
     }
 
     @JRubyMethod
-    public IRubyObject super_method(ThreadContext context ) {
-        return super_method(context, null, sourceModule.getSuperClass());
+    public IRubyObject super_method(ThreadContext context) {
+        RubyModule superClass = null;
+        if (method instanceof PartialDelegatingMethod) {
+            PartialDelegatingMethod delegate = (PartialDelegatingMethod)method;
+            RubyModule definedClass = delegate.getRealMethod().getDefinedClass();
+
+            RubyModule module = definedClass.findImplementer(sourceModule.getDelegate());
+            if (module != null) {
+                superClass = module.getSuperClass();
+            }
+        } else {
+            superClass = sourceModule.getSuperClass();
+        }
+
+        return super_method(context, null, superClass);
     }
 }
diff --git a/spec/ruby/core/method/fixtures/classes.rb b/spec/ruby/core/method/fixtures/classes.rb
@@ -213,4 +213,25 @@ def mul(n, m)
       n * m
     end
   end
+
+  module ChangedVisibility
+    module A
+      private
+      def derp(message)
+        500
+      end
+    end
+
+    module B
+      private
+      def derp
+        super('superclass')
+      end
+    end
+
+    class C
+      include A
+      include B
+    end
+  end
 end
diff --git a/spec/ruby/core/method/super_method_spec.rb b/spec/ruby/core/method/super_method_spec.rb
@@ -42,4 +42,13 @@ def overridden; end
 
     method.super_method.should == nil
   end
+
+  # jruby:7240
+  context "after changing an inherited methods visiblity" do
+    it "returns the expected super_method" do
+      MethodSpecs::ChangedVisibility::C.send :public, :derp
+
+      MethodSpecs::ChangedVisibility::C.instance_method(:derp).super_method.owner.should == MethodSpecs::ChangedVisibility::A
+    end
+  end
 end
diff --git a/spec/ruby/core/unboundmethod/super_method_spec.rb b/spec/ruby/core/unboundmethod/super_method_spec.rb
@@ -1,5 +1,6 @@
 require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
+require_relative '../method/fixtures/classes'
 
 describe "UnboundMethod#super_method" do
   it "returns the method that would be called by super in the method" do
@@ -25,4 +26,13 @@
 
     method.super_method.should == nil
   end
+
+  # jruby:7240
+  context "after changing an inherited methods visiblity" do
+    it "returns the expected super_method" do
+      MethodSpecs::ChangedVisibility::C.send :public, :derp
+
+      MethodSpecs::ChangedVisibility::C.new.method(:derp).super_method.owner.should == MethodSpecs::ChangedVisibility::A
+    end
+  end
 end
