Temporary patch to frobnicate kwargs in indy mode.

CompiledIRMethod calls frobnicate to restructure the keyword args entering a given call, separating symbol keys from non-symbol keys and duplicating the original hash. This is an expensive step but currently a neessary one. When we bind method calls via invokedynamic, CompiledIRMethod is skipped in favor of directly binding the target Ruby method's indy handle directly. This direct binding did not call frobnicate. Rather than complicate the indy binding logic, I have opted to have indy binding back off to the slower path that goes through CompiledIRMethod when the target method receives kwargs. This is a temporary fix until we can do a better job of representing keyword args from call site to callee without frobnicating. See #4725
jruby · Aug 8, 2017 · 8384ec3 · 8384ec3
1 parent d9473de
commit 8384ec3
Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/CompiledIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/CompiledIRMethod.java
@@ -212,4 +212,8 @@ public String toString() {
         return getClass().getName() + '@' + Integer.toHexString(hashCode()) + ' ' + method + ' ' + getSignature();
     }
 
+    public boolean hasKwargs() {
+        return hasKwargs;
+    }
+
 }
diff --git a/core/src/main/java/org/jruby/ir/targets/Bootstrap.java b/core/src/main/java/org/jruby/ir/targets/Bootstrap.java
@@ -481,6 +481,11 @@ static MethodHandle buildJittedHandle(InvokeSite site, DynamicMethod method, boo
         }
 
         if (compiledIRMethod != null) {
+
+            // Temporary fix for missing kwargs dup+splitting logic from frobnicate, called by CompiledIRMethod but
+            // skipped by indy's direct binding.
+            if (compiledIRMethod.hasKwargs()) return null;
+
             // attempt IR direct binding
             // TODO: this will have to expand when we start specializing arities