[GR-18163] Correct arity value for Proc (#2098)

PullRequest: truffleruby/1992

Author: eregon

CHANGELOG.md

@@ -35,6 +35,8 @@ Compatibility:
 * Implemented `rb_yield_values2`.
 * Implemented `Digest::Base#{update, <<}` (#2100).
 * Pass the final `super` specs (#2104, @chrisseaton).
+* Fix arity for arguments with optional kwargs (#1669, @ssnickolay)
+* Fix arity for `Proc` (#2098, @ssnickolay)
 
 Performance:
 

spec/tags/core/proc/arity_tags.txt

@@ -501,7 +501,8 @@ protected RubyHash eachBuckets(RubyHash hash, RubyProc block) {
 
         private Object yieldPair(RubyProc block, Object key, Object value) {
             // MRI behavior, see rb_hash_each_pair()
-            if (arityMoreThanOne.profile(block.sharedMethodInfo.getArity().getArityNumber() > 1)) {
+            // We use getMethodArityNumber() here since for non-lambda the semantics are the same for both branches
+            if (arityMoreThanOne.profile(block.sharedMethodInfo.getArity().getMethodArityNumber() > 1)) {
                 return yield(block, key, value);
             } else {
                 return yield(block, createArray(new Object[]{ key, value }));
@@ -722,7 +723,8 @@ protected RubyArray mapBuckets(RubyHash hash, RubyProc block,
 
         private Object yieldPair(RubyProc block, Object key, Object value) {
             // MRI behavior, see rb_hash_each_pair()
-            if (arityMoreThanOne.profile(block.sharedMethodInfo.getArity().getArityNumber() > 1)) {
+            // We use getMethodArityNumber() here since for non-lambda the semantics are the same for both branches
+            if (arityMoreThanOne.profile(block.sharedMethodInfo.getArity().getMethodArityNumber() > 1)) {
                 return yield(block, key, value);
             } else {
                 return yield(block, createArray(new Object[]{ key, value }));

src/main/java/org/truffleruby/core/hash/HashNodes.java

@@ -97,7 +97,7 @@ public abstract static class ArityNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
         protected int arity(RubyMethod method) {
-            return method.method.getSharedMethodInfo().getArity().getArityNumber();
+            return method.method.getArityNumber();
         }
 
     }

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

@@ -66,7 +66,7 @@ public abstract static class ArityNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
         protected int arity(RubyUnboundMethod unboundMethod) {
-            return unboundMethod.method.getSharedMethodInfo().getArity().getArityNumber();
+            return unboundMethod.method.getArityNumber();
         }
 
     }

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

@@ -160,9 +160,8 @@ public abstract static class ArityNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
         protected int arity(RubyProc proc) {
-            return proc.sharedMethodInfo.getArity().getArityNumber();
+            return proc.getArityNumber();
         }
-
     }
 
     @CoreMethod(names = "binding")

src/main/java/org/truffleruby/core/proc/ProcNodes.java

@@ -86,6 +86,10 @@ public SourceSection getSourceLocation() {
     }
     // endregion
 
+    public int getArityNumber() {
+        return sharedMethodInfo.getArity().getArityNumber(type);
+    }
+
     // region Executable
     @ExportMessage
     public boolean isExecutable() {

src/main/java/org/truffleruby/core/proc/RubyProc.java

@@ -59,7 +59,7 @@ protected Object executeDefinedHooksWithBinding(VirtualFrame frame,
     }
 
     protected int isDefinedArity(GlobalVariableStorage storage) {
-        return storage.getIsDefined().sharedMethodInfo.getArity().getArityNumber();
+        return storage.getIsDefined().getArityNumber();
     }
 
     protected GlobalVariableStorage getStorage() {

src/main/java/org/truffleruby/language/globals/IsDefinedGlobalVariableNode.java

@@ -53,7 +53,7 @@ protected Object readHooksWithBinding(VirtualFrame frame,
     }
 
     protected int getterArity(GlobalVariableStorage storage) {
-        return storage.getGetter().sharedMethodInfo.getArity().getArityNumber();
+        return storage.getGetter().getArityNumber();
     }
 
     protected GlobalVariableStorage getStorage() {

src/main/java/org/truffleruby/language/globals/ReadGlobalVariableNode.java

@@ -59,7 +59,7 @@ protected Object writeHooksWithBinding(VirtualFrame frame, Object value,
     }
 
     protected int setterArity(GlobalVariableStorage storage) {
-        return storage.getSetter().sharedMethodInfo.getArity().getArityNumber();
+        return storage.getSetter().getArityNumber();
     }
 
     protected GlobalVariableStorage getStorage() {