[GR-19220] Fix super method lookup for unbounded added methods

PullRequest: truffleruby/3893

Author: andrykonchin

CHANGELOG.md

@@ -8,6 +8,7 @@ Bug fixes:
 * Fix `Dir.glob` returning blank string entry with leading `**/` in glob and `base:` argument (@rwstauner).
 * Fix class lookup after an object's class has been replaced by `IO#reopen` (@itarato, @eregon).
 * Fix `Marshal.load` and raise `ArgumentError` when dump is broken and is too short (#3108, @andrykonchin).
+* Fix `super` method lookup for unbounded attached methods (#3131,  @itarato).
 
 Compatibility:
 

spec/ruby/core/module/define_method_spec.rb

@@ -133,6 +133,17 @@ class << klass
         klass.should have_public_instance_method(:baz)
       end
     end
+
+    it "sets the method owner for a dynamically added method with a different original owner" do
+      mixin_module = Module.new do
+        def bar; end
+      end
+
+      foo = Object.new
+      foo.singleton_class.define_method(:bar, mixin_module.instance_method(:bar))
+
+      foo.method(:bar).owner.should == foo.singleton_class
+    end
   end
 
   describe "passed a block" do

spec/ruby/language/super_spec.rb

@@ -203,6 +203,25 @@ def a(arg)
     -> { klass.new.a(:a_called) }.should raise_error(RuntimeError)
   end
 
+  it "is able to navigate to super, when a method is defined dynamically on the singleton class" do
+    foo_class = Class.new do
+      def bar
+        "bar"
+      end
+    end
+
+    mixin_module = Module.new do
+      def bar
+        "super_" + super
+      end
+    end
+
+    foo = foo_class.new
+    foo.singleton_class.define_method(:bar, mixin_module.instance_method(:bar))
+
+    foo.bar.should == "super_bar"
+  end
+
   # Rubinius ticket github#157
   it "calls method_missing when a superclass method is not found" do
     SuperSpecs::MM_B.new.is_a?(Hash).should == false

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

@@ -1505,7 +1505,8 @@ private RubySymbol addInternalMethod(RubyModule module, String name, InternalMet
 
             final Visibility visibility = DeclarationContext
                     .findVisibilityCheckSelfAndDefaultDefinee(module, callerFrame);
-            module.addMethodConsiderNameVisibility(getContext(), method, visibility, this);
+            module.addMethodConsiderNameVisibility(getContext(), method.withOwner(module).withDeclaringModule(module),
+                    visibility, this);
             return getSymbol(method.getName());
         }