Update method owner when it is being aliased

Author: bjfish

CHANGELOG.md

@@ -8,6 +8,7 @@ Bug fixes:
 * Fix `rb_id2name` to ensure the native string will have the same lifetime as the id (#2630, @aardvark179).
 * Fix `MatchData#[]` exception when passing a length argument larger than the number of match values (#2636, @nirvdrum).
 * Fix `MatchData#[]` exception when supplying a large negative index along with a length argument (@nirvdrum).
+* Fix aliased methods to return the correct owner when method is from a superclass (@bjfish).
 
 Compatibility:
 

spec/ruby/language/alias_spec.rb

@@ -243,6 +243,19 @@ def test_with_check(*args)
       e.class.should == NameError
     }
   end
+
+  it "defines the method on the aliased class when the original method is from a parent class" do
+    parent = Class.new do
+      def parent_method
+      end
+    end
+    child = Class.new(parent) do
+      alias parent_method_alias parent_method
+    end
+
+    child.instance_method(:parent_method_alias).owner.should == child
+    child.instance_methods(false).should include(:parent_method_alias)
+  end
 end
 
 describe "The alias keyword" do

src/main/java/org/truffleruby/core/method/MethodNodes.java

@@ -172,7 +172,7 @@ public abstract static class OwnerNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
         protected RubyModule owner(RubyMethod method) {
-            return method.method.getDeclaringModule();
+            return method.method.getOwner();
         }
 
     }

src/main/java/org/truffleruby/core/method/UnboundMethodNodes.java

@@ -155,7 +155,7 @@ public abstract static class OwnerNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
         protected RubyModule owner(RubyUnboundMethod unboundMethod) {
-            return unboundMethod.method.getDeclaringModule();
+            return unboundMethod.method.getOwner();
         }
 
     }

src/main/java/org/truffleruby/core/module/ModuleFields.java

@@ -213,7 +213,8 @@ public void initCopy(RubyModule from) {
             if (methodEntry.getMethod() != null) {
                 MethodEntry newMethodEntry = new MethodEntry(methodEntry
                         .getMethod()
-                        .withDeclaringModule(rubyModule));
+                        .withDeclaringModule(rubyModule)
+                        .withOwner(rubyModule));
                 this.methods.put(methodEntry.getMethod().getName(), newMethodEntry);
             }
         }
@@ -513,6 +514,8 @@ public void addMethod(RubyContext context, Node currentNode, InternalMethod meth
 
         checkFrozen(context, currentNode);
 
+        method = method.withOwner(rubyModule);
+
         if (SharedObjects.isShared(rubyModule)) {
             Set<Object> adjacent = ObjectGraph.newObjectSet();
             ObjectGraph.addProperty(adjacent, method);

src/main/java/org/truffleruby/core/module/RubyModule.java

@@ -96,7 +96,8 @@ public void addMethodIgnoreNameVisibility(RubyContext context, InternalMethod me
             singletonClass.fields.addMethod(
                     context,
                     currentNode,
-                    method.withDeclaringModule(singletonClass).withVisibility(Visibility.PUBLIC));
+                    method.withDeclaringModule(singletonClass).withOwner(singletonClass)
+                            .withVisibility(Visibility.PUBLIC));
         } else {
             fields.addMethod(context, currentNode, method.withVisibility(visibility));
         }

src/main/java/org/truffleruby/language/methods/InternalMethod.java

@@ -40,7 +40,10 @@ public class InternalMethod implements ObjectGraphNode {
     private final DeclarationContext activeRefinements;
     private final String name;
 
+    /** The module on which the method was initially declared in the source code (e.g., with def) */
     private final RubyModule declaringModule;
+    /** The module owning this InternalMethod (i.e., the method is part of that module's instance methods) */
+    private final RubyModule owner;
     private final Visibility visibility;
     private final boolean undefined;
     private final boolean unimplemented; // similar to MRI's rb_f_notimplement
@@ -124,6 +127,7 @@ public InternalMethod(
                 declarationContext,
                 name,
                 declaringModule,
+                declaringModule,
                 visibility,
                 undefined,
                 false,
@@ -142,6 +146,7 @@ private InternalMethod(
             DeclarationContext declarationContext,
             String name,
             RubyModule declaringModule,
+            RubyModule owner,
             Visibility visibility,
             boolean undefined,
             boolean unimplemented,
@@ -160,6 +165,7 @@ private InternalMethod(
         this.lexicalScope = lexicalScope;
         this.declarationContext = declarationContext;
         this.declaringModule = declaringModule;
+        this.owner = owner;
         this.name = name;
         this.visibility = visibility;
         this.undefined = undefined;
@@ -181,6 +187,10 @@ public RubyModule getDeclaringModule() {
         return declaringModule;
     }
 
+    public RubyModule getOwner() {
+        return owner;
+    }
+
     public String getName() {
         return name;
     }
@@ -235,6 +245,31 @@ public InternalMethod withDeclaringModule(RubyModule newDeclaringModule) {
                     declarationContext,
                     name,
                     newDeclaringModule,
+                    owner,
+                    visibility,
+                    undefined,
+                    unimplemented,
+                    builtIn,
+                    alwaysInlinedNodeFactory,
+                    activeRefinements,
+                    proc,
+                    callTarget,
+                    callTargetSupplier,
+                    capturedBlock);
+        }
+    }
+
+    public InternalMethod withOwner(RubyModule newOwner) {
+        if (newOwner == owner) {
+            return this;
+        } else {
+            return new InternalMethod(
+                    sharedMethodInfo,
+                    lexicalScope,
+                    declarationContext,
+                    name,
+                    declaringModule,
+                    newOwner,
                     visibility,
                     undefined,
                     unimplemented,
@@ -258,6 +293,7 @@ public InternalMethod withName(String newName) {
                     declarationContext,
                     newName,
                     declaringModule,
+                    owner,
                     visibility,
                     undefined,
                     unimplemented,
@@ -281,6 +317,7 @@ public InternalMethod withVisibility(Visibility newVisibility) {
                     declarationContext,
                     name,
                     declaringModule,
+                    owner,
                     newVisibility,
                     undefined,
                     unimplemented,
@@ -304,6 +341,7 @@ public InternalMethod withActiveRefinements(DeclarationContext context) {
                     declarationContext,
                     name,
                     declaringModule,
+                    owner,
                     visibility,
                     undefined,
                     unimplemented,
@@ -327,6 +365,7 @@ public InternalMethod withDeclarationContext(DeclarationContext newDeclarationCo
                     newDeclarationContext,
                     name,
                     declaringModule,
+                    owner,
                     visibility,
                     undefined,
                     unimplemented,
@@ -347,6 +386,7 @@ public InternalMethod undefined() {
                 declarationContext,
                 name,
                 declaringModule,
+                owner,
                 visibility,
                 true,
                 unimplemented,
@@ -366,6 +406,7 @@ public InternalMethod unimplemented() {
                 declarationContext,
                 name,
                 declaringModule,
+                owner,
                 visibility,
                 undefined,
                 true,