The empty keyword descriptor can be static

Author: chrisseaton

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -90,6 +90,7 @@
 import org.truffleruby.language.arguments.ArgumentsDescriptor;
 import org.truffleruby.language.arguments.EmptyArgumentsDescriptor;
 import org.truffleruby.language.arguments.KeywordArgumentsDescriptor;
+import org.truffleruby.language.arguments.KeywordArgumentsDescriptorManager;
 import org.truffleruby.language.arguments.RubyArguments;
 import org.truffleruby.language.backtrace.Backtrace;
 import org.truffleruby.language.constants.GetConstantNode;
@@ -320,7 +321,7 @@ protected Object sendWithoutCExtLock(
                         dispatchNode, ownedProfile);
             } else {
                 return sendWithoutCExtLock(frame, receiver, method, block,
-                        getLanguage().keywordArgumentsDescriptorManager.EMPTY, args,
+                        KeywordArgumentsDescriptorManager.EMPTY, args,
                         dispatchNode, ownedProfile);
             }
         }

src/main/java/org/truffleruby/language/arguments/KeywordArgumentsDescriptorManager.java

@@ -16,9 +16,14 @@
 
 public class KeywordArgumentsDescriptorManager {
 
+    public static final KeywordArgumentsDescriptor EMPTY = new KeywordArgumentsDescriptor(
+            StringUtils.EMPTY_STRING_ARRAY);
+
     private final WeakValueCache<Key, KeywordArgumentsDescriptor> CANONICAL_KEYWORD_DESCRIPTORS = new WeakValueCache<>();
 
-    public final KeywordArgumentsDescriptor EMPTY = getArgumentsDescriptor(StringUtils.EMPTY_STRING_ARRAY);
+    public KeywordArgumentsDescriptorManager() {
+        CANONICAL_KEYWORD_DESCRIPTORS.put(new Key(StringUtils.EMPTY_STRING_ARRAY), EMPTY);
+    }
 
     public KeywordArgumentsDescriptor getArgumentsDescriptor(String[] keywords) {
         final Key key = new Key(keywords);

src/main/java/org/truffleruby/language/dispatch/DispatchNode.java

@@ -28,6 +28,7 @@
 import org.truffleruby.language.RubyRootNode;
 import org.truffleruby.language.arguments.ArgumentsDescriptor;
 import org.truffleruby.language.arguments.EmptyArgumentsDescriptor;
+import org.truffleruby.language.arguments.KeywordArgumentsDescriptorManager;
 import org.truffleruby.language.arguments.RubyArguments;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.methods.CallForeignMethodNode;
@@ -159,7 +160,7 @@ public Object callWithKeywords(Object receiver, String method, Object arg1, Ruby
         final Object[] rubyArgs = RubyArguments.allocate(2);
         RubyArguments.setSelf(rubyArgs, receiver);
         RubyArguments.setBlock(rubyArgs, nil);
-        RubyArguments.setDescriptor(rubyArgs, getLanguage().keywordArgumentsDescriptorManager.EMPTY);
+        RubyArguments.setDescriptor(rubyArgs, KeywordArgumentsDescriptorManager.EMPTY);
         RubyArguments.setArgument(rubyArgs, 0, arg1);
         RubyArguments.setArgument(rubyArgs, 1, keywords);
         return dispatch(null, receiver, method, rubyArgs);

src/main/java/org/truffleruby/language/dispatch/LiteralCallNode.java

@@ -18,6 +18,8 @@
 
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import org.truffleruby.language.arguments.EmptyArgumentsDescriptor;
+import org.truffleruby.language.arguments.KeywordArgumentsDescriptor;
+import org.truffleruby.language.arguments.KeywordArgumentsDescriptorManager;
 
 /** A literal call site in Ruby code: one of foo(), super or yield. */
 public abstract class LiteralCallNode extends RubyContextSourceNode {
@@ -60,7 +62,7 @@ protected ArgumentsDescriptor getArgumentsDescriptorAndCheckRuby2KeywordsHash(Ob
 
                     RubyHash unmarked = copyHashAndSetRuby2KeywordsNode.execute((RubyHash) lastArgument, false);
                     ArrayUtils.setLast(args, unmarked);
-                    return getLanguage().keywordArgumentsDescriptorManager.EMPTY;
+                    return KeywordArgumentsDescriptorManager.EMPTY;
                 } else {
                     if (!notRuby2KeywordsHashProfile) {
                         CompilerDirectives.transferToInterpreterAndInvalidate();

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

@@ -27,6 +27,7 @@
 import org.truffleruby.language.SourceIndexLength;
 import org.truffleruby.language.arguments.ArgumentsDescriptor;
 import org.truffleruby.language.arguments.EmptyArgumentsDescriptor;
+import org.truffleruby.language.arguments.KeywordArgumentsDescriptorManager;
 import org.truffleruby.language.arguments.MissingArgumentBehavior;
 import org.truffleruby.language.arguments.ReadPreArgumentNode;
 import org.truffleruby.language.arguments.ShouldDestructureNode;
@@ -498,7 +499,7 @@ public RubyNode visitZSuperNode(ZSuperParseNode node) {
         final SequenceNode reloadSequence = (SequenceNode) reloadTranslator.visitArgsNode(argsNode);
 
         final ArgumentsDescriptor descriptor = argsNode.hasKwargs()
-                ? language.keywordArgumentsDescriptorManager.EMPTY
+                ? KeywordArgumentsDescriptorManager.EMPTY
                 : EmptyArgumentsDescriptor.INSTANCE;
         final RubyNode arguments = new ReadZSuperArgumentsNode(
                 reloadTranslator.getRestParameterIndex(),