Fix ArgumentType for anonymous keyword rest arguments

Author: andrykonchin

spec/truffle/parsing/fixtures/block/argument_descriptors/with_double_splat_operator_without_name.yaml

@@ -19,7 +19,7 @@ ast: |
           callTargets = ProcCallTargets(callTargetForProc = block in <top (required)>, callTargetForLambda = null, altCallTargetCompiler = org.truffleruby.parser.MethodTranslator$$Lambda$.../0x...@...)
           flags = 0
           frameOnStackMarkerSlot = 2
-          sharedMethodInfo = SharedMethodInfo(sourceSection = SourceSection(source=<parse_ast> [1 - 1], index=0, length=20, characters=proc do |a:, b:, **|), staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}, originName = block in <top (required)>, blockDepth = 1, parseName = block in <top (required)>, notes = <top (required)>, argumentDescriptors = [ArgumentDescriptor(name = a, type = keyreq), ArgumentDescriptor(name = b, type = keyreq), ArgumentDescriptor(name = %kwrest, type = keyrest)])
+          sharedMethodInfo = SharedMethodInfo(sourceSection = SourceSection(source=<parse_ast> [1 - 1], index=0, length=20, characters=proc do |a:, b:, **|), staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}, originName = block in <top (required)>, blockDepth = 1, parseName = block in <top (required)>, notes = <top (required)>, argumentDescriptors = [ArgumentDescriptor(name = a, type = keyreq), ArgumentDescriptor(name = b, type = keyreq), ArgumentDescriptor(name = %kwrest, type = anonkeyrest)])
           type = PROC
       call targets:
           RubyProcRootNode
@@ -33,7 +33,7 @@ ast: |
                   redoProfile = false
                   retryProfile = false
                   returnID = org.truffleruby.language.control.ReturnID@...
-                  sharedMethodInfo = SharedMethodInfo(sourceSection = SourceSection(source=<parse_ast> [1 - 1], index=0, length=20, characters=proc do |a:, b:, **|), staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}, originName = block in <top (required)>, blockDepth = 1, parseName = block in <top (required)>, notes = <top (required)>, argumentDescriptors = [ArgumentDescriptor(name = a, type = keyreq), ArgumentDescriptor(name = b, type = keyreq), ArgumentDescriptor(name = %kwrest, type = keyrest)])
+                  sharedMethodInfo = SharedMethodInfo(sourceSection = SourceSection(source=<parse_ast> [1 - 1], index=0, length=20, characters=proc do |a:, b:, **|), staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}, originName = block in <top (required)>, blockDepth = 1, parseName = block in <top (required)>, notes = <top (required)>, argumentDescriptors = [ArgumentDescriptor(name = a, type = keyreq), ArgumentDescriptor(name = b, type = keyreq), ArgumentDescriptor(name = %kwrest, type = anonkeyrest)])
                   sourceSection = SourceSection(source=<parse_ast> [1 - 1], index=0, length=20, characters=proc do |a:, b:, **|)
                   split = HEURISTIC
               children:

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

@@ -4,10 +4,9 @@ notes: >
   Method parameters are described (as ArgumentDescriptor[]) in the following way:
     - ArgumentDescriptor(name = a, type = keyreq)
     - ArgumentDescriptor(name = b, type = keyreq)
-    - ArgumentDescriptor(name = %kwrest, type = keyrest)
+    - ArgumentDescriptor(name = %kwrest, type = anonkeyrest)
   
-  So the rest keyword arguments are described as a `keyrest` variable with surrogate name `%kwrest`.
-# TODO: why not anonrest?
+  So the rest keyword arguments are described as a `anonkeyrest` variable with surrogate name `%kwrest`.
 focused_on_node: "org.truffleruby.language.methods.LiteralMethodDefinitionNode"
 ruby: |
   def foo(a:, b:, **)
@@ -19,7 +18,7 @@ ast: |
           flags = 1
           isDefSingleton = false
           name = "foo"
-          sharedMethodInfo = SharedMethodInfo(sourceSection = SourceSection(source=<parse_ast> [1 - 2], index=0, length=23, characters=def foo(a:, b:, **)\nend), staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = a, type = keyreq), ArgumentDescriptor(name = b, type = keyreq), ArgumentDescriptor(name = %kwrest, type = keyrest)])
+          sharedMethodInfo = SharedMethodInfo(sourceSection = SourceSection(source=<parse_ast> [1 - 2], index=0, length=23, characters=def foo(a:, b:, **)\nend), staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = a, type = keyreq), ArgumentDescriptor(name = b, type = keyreq), ArgumentDescriptor(name = %kwrest, type = anonkeyrest)])
       call targets:
           RubyMethodRootNode
               attributes:
@@ -36,7 +35,7 @@ ast: |
                   polyglotRef = org.truffleruby.RubyLanguage@...
                   retryProfile = false
                   returnID = org.truffleruby.language.control.ReturnID@...
-                  sharedMethodInfo = SharedMethodInfo(sourceSection = SourceSection(source=<parse_ast> [1 - 2], index=0, length=23, characters=def foo(a:, b:, **)\nend), staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = a, type = keyreq), ArgumentDescriptor(name = b, type = keyreq), ArgumentDescriptor(name = %kwrest, type = keyrest)])
+                  sharedMethodInfo = SharedMethodInfo(sourceSection = SourceSection(source=<parse_ast> [1 - 2], index=0, length=23, characters=def foo(a:, b:, **)\nend), staticLexicalScope =  :: Object, arity = Arity{preRequired = 0, optional = 0, hasRest = false, postRequired = 0, keywordArguments = [a, b], requiredKeywordArgumentsCount = 2, hasKeywordsRest = true}, originName = foo, blockDepth = 0, parseName = Object#foo, notes = null, argumentDescriptors = [ArgumentDescriptor(name = a, type = keyreq), ArgumentDescriptor(name = b, type = keyreq), ArgumentDescriptor(name = %kwrest, type = anonkeyrest)])
                   sourceSection = SourceSection(source=<parse_ast> [1 - 2], index=0, length=23, characters=def foo(a:, b:, **)\nend)
                   split = HEURISTIC
               children:

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

@@ -42,6 +42,7 @@
 import org.truffleruby.parser.ast.RequiredKeywordArgumentValueParseNode;
 import org.truffleruby.parser.ast.UnnamedRestArgParseNode;
 import org.truffleruby.parser.ast.types.INameNode;
+import org.truffleruby.parser.parser.ParserSupport;
 
 public final class Helpers {
 
@@ -131,7 +132,7 @@ public static ArgumentDescriptor[] argsNodeToArgumentDescriptors(ArgsParseNode a
 
         if (argsNode.getKeyRest() != null) {
             String argName = argsNode.getKeyRest().getName();
-            if (argName == null || argName.length() == 0) {
+            if (argName == null || argName.length() == 0 || argName.equals(ParserSupport.KWREST_VAR)) {
                 descs.add(new ArgumentDescriptor(ArgumentType.anonkeyrest, argName));
             } else {
                 descs.add(new ArgumentDescriptor(ArgumentType.keyrest, argsNode.getKeyRest().getName()));

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

@@ -180,6 +180,7 @@ public final class ParserSupport {
             .usAsciiString(FORWARD_ARGS_KWREST_VAR);
     /** The local variable to store the block from ... in */
     public static final String FORWARD_ARGS_BLOCK_VAR = Layouts.TEMP_PREFIX + "forward_block";
+    public static final String KWREST_VAR = Layouts.TEMP_PREFIX + "kwrest";
     public static final TruffleString FORWARD_ARGS_BLOCK_VAR_TSTRING = TStringUtils
             .usAsciiString(FORWARD_ARGS_BLOCK_VAR);
     /** A prefix for duplicated '_' local variables to build unique names */
@@ -1571,7 +1572,7 @@ public ArgsTailHolder new_args_tail(SourceIndexLength position, ListParseNode ke
 
         final String restKwargsName;
         if (keywordRestArgName.isEmpty()) {
-            restKwargsName = Layouts.TEMP_PREFIX + "kwrest";
+            restKwargsName = KWREST_VAR;
         } else {
             restKwargsName = keywordRestArgName.toJavaStringUncached().intern();
         }