Simplify

Author: eregon

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

@@ -9,54 +9,49 @@
  */
 package org.truffleruby.core.hash;
 
+import com.oracle.truffle.api.dsl.Cached;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.language.ImmutableRubyString;
 import org.truffleruby.language.RubyContextNode;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.library.RubyLibrary;
 
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
-import org.truffleruby.language.library.RubyStringLibrary;
 
 public abstract class FreezeHashKeyIfNeededNode extends RubyContextNode {
 
-    @Child private DispatchNode dupNode;
-
     public abstract Object executeFreezeIfNeeded(Object key, boolean compareByIdentity);
 
     @Specialization
-    protected Object alreadyFrozen(ImmutableRubyString string, boolean compareByIdentity) {
+    protected Object immutable(ImmutableRubyString string, boolean compareByIdentity) {
         return string;
     }
 
     @Specialization(
-            guards = { "strings.isRubyString(string)", "rubyLibrary.isFrozen(string)" },
+            guards = "rubyLibrary.isFrozen(string)",
             limit = "getRubyLibraryCacheLimit()")
-    protected Object alreadyFrozen(Object string, boolean compareByIdentity,
-            @CachedLibrary(limit = "2") RubyStringLibrary strings,
+    protected Object alreadyFrozen(RubyString string, boolean compareByIdentity,
             @CachedLibrary("string") RubyLibrary rubyLibrary) {
         return string;
     }
 
     @Specialization(
-            guards = { "strings.isRubyString(string)", "!rubyLibrary.isFrozen(string)", "!compareByIdentity" },
+            guards = { "!rubyLibrary.isFrozen(string)", "!compareByIdentity" },
             limit = "getRubyLibraryCacheLimit()")
-    protected Object dupAndFreeze(Object string, boolean compareByIdentity,
-            @CachedLibrary(limit = "2") RubyStringLibrary strings,
+    protected Object dupAndFreeze(RubyString string, boolean compareByIdentity,
             @CachedLibrary("string") RubyLibrary rubyLibrary,
-            @CachedLibrary(limit = "getRubyLibraryCacheLimit()") RubyLibrary rubyLibraryObject) {
-        final Object object = dup(string);
+            @CachedLibrary(limit = "getRubyLibraryCacheLimit()") RubyLibrary rubyLibraryObject,
+            @Cached DispatchNode dupNode) {
+        final Object object = dupNode.call(string, "dup");
         rubyLibraryObject.freeze(object);
         return object;
     }
 
     @Specialization(
-            guards = { "strings.isRubyString(string)", "!rubyLibrary.isFrozen(string)", "compareByIdentity" },
+            guards = { "!rubyLibrary.isFrozen(string)", "compareByIdentity" },
             limit = "getRubyLibraryCacheLimit()")
     protected Object compareByIdentity(RubyString string, boolean compareByIdentity,
-            @CachedLibrary(limit = "2") RubyStringLibrary strings,
             @CachedLibrary("string") RubyLibrary rubyLibrary) {
         return string;
     }
@@ -66,14 +61,4 @@ protected Object passThrough(Object value, boolean compareByIdentity) {
         return value;
     }
 
-
-    private Object dup(Object value) {
-        if (dupNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            dupNode = insert(DispatchNode.create());
-        }
-        return dupNode.call(value, "dup");
-    }
-
-
 }