Merge pull request #7575 from headius/super_method_in_metaclass

headius · web-flow · commit eaef7e5ccb76 · 2023-01-12T13:39:21.000-05:00
Fix Method#super_method.owner pointing at wrong class
diff --git a/core/src/main/java/org/jruby/AbstractRubyMethod.java b/core/src/main/java/org/jruby/AbstractRubyMethod.java
@@ -153,9 +153,9 @@ protected IRubyObject super_method(ThreadContext context, IRubyObject receiver,
         }
 
         if (receiver == null) {
-            return RubyUnboundMethod.newUnboundMethod(superClass, methodName, superClass, originName, entry);
+            return RubyUnboundMethod.newUnboundMethod(entry.sourceModule, methodName, superClass, originName, entry);
         } else {
-            return RubyMethod.newMethod(superClass, methodName, superClass, originName, entry, receiver);
+            return RubyMethod.newMethod(entry.sourceModule, methodName, superClass, originName, entry, receiver);
         }
     }
 
diff --git a/test/mri/excludes/TestMethod.rb b/test/mri/excludes/TestMethod.rb
@@ -4,13 +4,9 @@
 exclude :test_callee, "needs investigation"
 exclude :test_define_method_visibility, "needs investigation"
 exclude :test_gced_bmethod, "often 'Timeout::Error: execution of assert_normal_exit expired' on CI"
-exclude :test_inspect, "fails since an alias-ed method does not distinguish owner and implementor module"
 exclude :test_hash, "won't pass since Array#map is not a Array#collect alias as in MRI"
 exclude :test_orphan_callee, "needs investigation"
 exclude :test_prepended_public_zsuper, "2.4 fix/change to prepend + method + super_method (#4687)"
 exclude :test_splat_long_array, "passes locally but fails on travis OOME"
-exclude :test_super_method_module, "needs investigation, new in 2.5"
-exclude :test_super_method_with_prepended_module, "2.5 test for super with prepend has issues (#4687)"
-exclude :test_to_proc_binding, "NullPointerException in parser"
 exclude :test_super_method_alias_to_prepended_module, "needs investigation"
-exclude :test_super_method_alias, "needs investigation"
+exclude :test_to_proc_binding, "NullPointerException in parser"

Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,9 @@ protected IRubyObject super_method(ThreadContext context, IRubyObject receiver,`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`if (receiver == null) {`
`156`		`- return RubyUnboundMethod.newUnboundMethod(superClass, methodName, superClass, originName, entry);`
	`156`	`+ return RubyUnboundMethod.newUnboundMethod(entry.sourceModule, methodName, superClass, originName, entry);`
`157`	`157`	`} else {`
`158`		`- return RubyMethod.newMethod(superClass, methodName, superClass, originName, entry, receiver);`
	`158`	`+ return RubyMethod.newMethod(entry.sourceModule, methodName, superClass, originName, entry, receiver);`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`