Fix #parameters for **nil

Author: andrykonchin

spec/ruby/core/method/parameters_spec.rb

@@ -7,6 +7,7 @@ def one_key(a: 1); end
     def one_keyrest(**a); end
 
     def one_keyreq(a:); end
+    def one_nokey(**nil); end
 
     def one_splat_one_req(*a,b); end
     def one_splat_two_req(*a,b,c); end
@@ -178,6 +179,11 @@ def underscore_parameters(_, _, _ = 1, *_, _:, _: 2, **_, &_); end
     m.parameters.should == [[:keyreq,:a]]
   end
 
+  it "returns [[:nokey]] for a method with a single **nil parameter" do
+    m = MethodSpecs::Methods.instance_method(:one_nokey)
+    m.parameters.should == [[:nokey]]
+  end
+
   it "works with ->(){} as the value of an optional argument" do
     m = MethodSpecs::Methods.instance_method(:one_opt_with_stabby)
     m.parameters.should == [[:opt,:a]]

spec/truffle/parsing/fixtures/def/argument_descriptors/with_rejecting_keyword_arguments.yaml

@@ -16,7 +16,7 @@ ast: |
           flags = 1
           isDefSingleton = false
           name = "foo"
-          sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %nil_kwrest, type = keyrest)])
+          sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = null, type = nokey)])
       call targets:
           RubyMethodRootNode
               attributes:
@@ -33,7 +33,7 @@ ast: |
                   polyglotRef = org.truffleruby.RubyLanguage@...
                   retryProfile = false
                   returnID = org.truffleruby.language.control.ReturnID@...
-                  sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %nil_kwrest, type = keyrest)])
+                  sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = null, type = nokey)])
                   split = HEURISTIC
               children:
                   body =

spec/truffle/parsing/fixtures/def/arity/with_rejecting_keyword_arguments.yaml

@@ -20,7 +20,7 @@ ast: |
           flags = 1
           isDefSingleton = false
           name = "foo"
-          sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %nil_kwrest, type = keyrest)])
+          sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = null, type = nokey)])
       call targets:
           RubyMethodRootNode
               attributes:
@@ -37,7 +37,7 @@ ast: |
                   polyglotRef = org.truffleruby.RubyLanguage@...
                   retryProfile = false
                   returnID = org.truffleruby.language.control.ReturnID@...
-                  sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %nil_kwrest, type = keyrest)])
+                  sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = null, type = nokey)])
                   split = HEURISTIC
               children:
                   body =

spec/truffle/parsing/fixtures/def/parameters_to_local_variables/with_rejecting_keyword_arguments.yaml

@@ -16,7 +16,7 @@ ast: |
           flags = 1
           isDefSingleton = false
           name = "foo"
-          sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %nil_kwrest, type = keyrest)])
+          sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = null, type = nokey)])
       call targets:
           RubyMethodRootNode
               attributes:
@@ -33,7 +33,7 @@ ast: |
                   polyglotRef = org.truffleruby.RubyLanguage@...
                   retryProfile = false
                   returnID = org.truffleruby.language.control.ReturnID@...
-                  sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = %nil_kwrest, type = keyrest)])
+                  sharedMethodInfo = SharedMethodInfo(staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [], requiredKeywordArgumentsCount = 0, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = null, type = nokey)])
                   split = HEURISTIC
               children:
                   body =

src/main/java/org/truffleruby/parser/ArgumentType.java

@@ -38,7 +38,8 @@ public enum ArgumentType {
     anonreq("req", true),
     anonopt("opt", true),
     anonrest("rest", true),
-    anonkeyrest("keyrest", true);
+    anonkeyrest("keyrest", true),
+    nokey("nokey", true); // **nil
 
     ArgumentType(String symbolicName, boolean anonymous) {
         this.symbolicName = symbolicName;

src/main/java/org/truffleruby/parser/Helpers.java

@@ -37,6 +37,7 @@
 import org.truffleruby.parser.ast.KeywordArgParseNode;
 import org.truffleruby.parser.ast.LocalAsgnParseNode;
 import org.truffleruby.parser.ast.MultipleAsgnParseNode;
+import org.truffleruby.parser.ast.NoKeywordsArgParseNode;
 import org.truffleruby.parser.ast.OptArgParseNode;
 import org.truffleruby.parser.ast.ParseNode;
 import org.truffleruby.parser.ast.RequiredKeywordArgumentValueParseNode;
@@ -136,6 +137,8 @@ public static ArgumentDescriptor[] argsNodeToArgumentDescriptors(ArgsParseNode a
 
             if (argName.equals(ParserSupport.KWREST_VAR)) {
                 descs.add(new ArgumentDescriptor(ArgumentType.anonkeyrest, argName));
+            } else if (argsNode.getKeyRest() instanceof NoKeywordsArgParseNode) {
+                descs.add(new ArgumentDescriptor(ArgumentType.nokey));
             } else {
                 descs.add(new ArgumentDescriptor(ArgumentType.keyrest, argsNode.getKeyRest().getName()));
             }

src/main/java/org/truffleruby/parser/YARPLoadArgumentsTranslator.java

@@ -12,7 +12,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.truffleruby.Layouts;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.language.RubyNode;
 import org.truffleruby.language.arguments.CheckNoKeywordArgumentsNode;
@@ -32,8 +31,6 @@
 
 public final class YARPLoadArgumentsTranslator extends AbstractNodeVisitor<RubyNode> {
 
-    static final String DEFAULT_NO_KEYWORD_REST_NAME = Layouts.TEMP_PREFIX + "nil_kwrest";
-
     private final Arity arity;
     private final boolean isProc;
     private final boolean isMethod;

src/main/java/org/truffleruby/parser/YARPTranslator.java

@@ -2290,7 +2290,7 @@ private ArgumentDescriptor[] parametersNodeToArgumentDescriptors(Nodes.Parameter
                     descriptors.add(new ArgumentDescriptor(ArgumentType.keyrest, keywordRestParameterNode.name));
                 }
             } else if (parametersNode.keyword_rest instanceof Nodes.NoKeywordsParameterNode) {
-                final var descriptor = new ArgumentDescriptor(ArgumentType.keyrest, YARPLoadArgumentsTranslator.DEFAULT_NO_KEYWORD_REST_NAME);
+                final var descriptor = new ArgumentDescriptor(ArgumentType.nokey);
                 descriptors.add(descriptor);
             } else {
                 throw CompilerDirectives.shouldNotReachHere();