Merge pull request jruby#9001 from headius/ruby2_kwargs_indy_fix_9.4

Backport indy ruby2_keywords ArgumentError fix

Author: headius

core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java

@@ -739,12 +739,12 @@ private static IRubyObject receiverSpecificArityKwargsCommon(ThreadContext conte
             // This complicates check_arity but empty ** is special case.
             RubyHash hash = (RubyHash) last;
             return hash;
-        } else if (!isKwarg) {
-            // This is just an ordinary hash as last argument
-            return last;
-        } else {
+        } else if (isKwarg || ((RubyHash) last).isRuby2KeywordHash()) {
             RubyHash hash = (RubyHash) last;
             return hash.dupFast(context);
+        } else {
+            // This is just an ordinary hash as last argument
+            return last;
         }
     }
 

core/src/main/java/org/jruby/ir/targets/indy/InvokeSite.java

@@ -704,13 +704,13 @@ private void finishBinding(CacheEntry entry, MethodHandle mh, IRubyObject self,
         SmartBinder baseBinder = SmartBinder.from(signature.changeReturn(void.class)).permute("context");
 
         // if target method takes keywords and we are passing them, set callInfo
-        boolean acceptsKeywords = true;
+        boolean acceptsKeywords;
         DynamicMethod method = entry.method;
 
         NativeCallMethod nativeMethod;
-        if (method instanceof AbstractIRMethod && ((AbstractIRMethod) method).getRuby2Keywords()) {
-            // Ruby methods with ruby2_keywords don't use formal keywords
-            acceptsKeywords = false;
+        if (method instanceof AbstractIRMethod) {
+            // Ruby methods handle clearing kwargs flags on their own
+            acceptsKeywords = true;
         } else if (method instanceof NativeCallMethod && (nativeMethod = (NativeCallMethod) method).getNativeCall() != null) {
             // native methods accept keywords only if specified
             DynamicMethod.NativeCall nativeCall = nativeMethod.getNativeCall();
@@ -720,6 +720,8 @@ private void finishBinding(CacheEntry entry, MethodHandle mh, IRubyObject self,
             } else {
                 acceptsKeywords = false;
             }
+        } else {
+            acceptsKeywords = true;
         }
 
         if (flags == 0 || !acceptsKeywords) {

spec/ruby/core/module/ruby2_keywords_spec.rb

@@ -294,4 +294,29 @@ def obj.foo(**a) end
       end
     }.should complain(/Skipping set of ruby2_keywords flag for/)
   end
+
+  describe "used on a method that forwards rest arguments" do
+    it "properly forwards to a keyword arguments-receiving method" do
+      obj = Class.new do
+        def foo(*a, **b)
+          [a, b]
+        end
+
+        ruby2_keywords def bar(*d)
+          foo(*d)
+        end
+
+        def test(...)
+          bar(...)
+        end
+      end.new
+
+      # Use test forwarding method to ensure bar call site is used repeatedly
+      # See https://github.com/jruby/jruby/issues/8920#issuecomment-3097667358
+      obj.test().should == [[], {}]
+      obj.test(e: 3).should == [[], {e: 3}]
+      obj.test(1).should == [[1], {}]
+      obj.test(1, e: 3).should == [[1], {e: 3}]
+    end
+  end
 end

spec/tags/ruby/core/module/ruby2_keywords_tags.txt

@@ -1,2 +1 @@
 fails:Module#ruby2_keywords does NOT copy the Hash when calling a method taking (*args)
-fails(JIT mode only):Module#ruby2_keywords makes a copy and unmark the Hash when calling a method taking (arg)