Convert FreezeHashKeyIfNeededNode to DSL inlinable node

Author: horakivo

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

@@ -10,7 +10,10 @@
 package org.truffleruby.core.hash;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateCached;
+import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.nodes.Node;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.ImmutableRubyString;
 import org.truffleruby.language.RubyBaseNode;
@@ -19,35 +22,37 @@
 import com.oracle.truffle.api.dsl.Specialization;
 
 @GenerateUncached
+@GenerateInline
+@GenerateCached(false)
 public abstract class FreezeHashKeyIfNeededNode extends RubyBaseNode {
 
-    public abstract Object executeFreezeIfNeeded(Object key, boolean compareByIdentity);
+    public abstract Object executeFreezeIfNeeded(Node node, Object key, boolean compareByIdentity);
 
     @Specialization
-    Object immutable(ImmutableRubyString string, boolean compareByIdentity) {
+    static Object immutable(ImmutableRubyString string, boolean compareByIdentity) {
         return string;
     }
 
     @Specialization(guards = "string.isFrozen()")
-    Object alreadyFrozen(RubyString string, boolean compareByIdentity) {
+    static Object alreadyFrozen(RubyString string, boolean compareByIdentity) {
         return string;
     }
 
     @Specialization(guards = { "!string.isFrozen()", "!compareByIdentity" })
-    Object dupAndFreeze(RubyString string, boolean compareByIdentity,
-            @Cached DispatchNode dupNode) {
+    static Object dupAndFreeze(RubyString string, boolean compareByIdentity,
+            @Cached(inline = false) DispatchNode dupNode) {
         final RubyString copy = (RubyString) dupNode.call(string, "dup");
         copy.freeze();
         return copy;
     }
 
     @Specialization(guards = { "!string.isFrozen()", "compareByIdentity" })
-    Object compareByIdentity(RubyString string, boolean compareByIdentity) {
+    static Object compareByIdentity(RubyString string, boolean compareByIdentity) {
         return string;
     }
 
     @Specialization(guards = "isNotRubyString(value)")
-    Object passThrough(Object value, boolean compareByIdentity) {
+    static Object passThrough(Object value, boolean compareByIdentity) {
         return value;
     }
 }

src/main/java/org/truffleruby/core/hash/library/BucketsHashStore.java

@@ -246,7 +246,7 @@ protected boolean set(RubyHash hash, Object key, Object value, boolean byIdentit
             @Bind("$node") Node node) {
         assert verify(hash);
 
-        final Object key2 = freezeHashKeyIfNeeded.executeFreezeIfNeeded(key, byIdentity);
+        final Object key2 = freezeHashKeyIfNeeded.executeFreezeIfNeeded(node, key, byIdentity);
 
         propagateSharingKey.execute(node, hash, key2);
         propagateSharingValue.execute(node, hash, value);

src/main/java/org/truffleruby/core/hash/library/PackedHashStoreLibrary.java

@@ -177,7 +177,7 @@ static boolean setFirst(Object[] store, RubyHash hash, Object key, Object value,
                 @Cached @Shared PropagateSharingNode propagateSharingValue,
                 @Bind("this") Node node) {
 
-            final Object key2 = freezeHashKeyIfNeeded.executeFreezeIfNeeded(key, byIdentity);
+            final Object key2 = freezeHashKeyIfNeeded.executeFreezeIfNeeded(node, key, byIdentity);
             propagateSharingKey.execute(node, hash, key2);
             propagateSharingValue.execute(node, hash, value);
             setHashedKeyValue(store, 0, hashNode.execute(key2, byIdentity), key2, value);
@@ -199,7 +199,7 @@ static boolean set(Object[] store, RubyHash hash, Object key, Object value, bool
 
             assert verify(store, hash);
             final int size = hash.size;
-            final Object key2 = freezeHashKeyIfNeeded.executeFreezeIfNeeded(key, byIdentity);
+            final Object key2 = freezeHashKeyIfNeeded.executeFreezeIfNeeded(node, key, byIdentity);
             final int hashed = hashNode.execute(key2, byIdentity);
             propagateSharingKey.execute(node, hash, key2);
             propagateSharingValue.execute(node, hash, value);
@@ -499,7 +499,7 @@ Object doHash(VirtualFrame frame,
 
             for (int n = 0; n < keyValues.length / 2; n++) {
                 Object key = keyValues[n * 2].execute(frame);
-                key = freezeHashKeyIfNeededNode.executeFreezeIfNeeded(key, false);
+                key = freezeHashKeyIfNeededNode.executeFreezeIfNeeded(this, key, false);
 
                 final int hashed = hash(key);