Convert CheckIVarNameNode to DSL inlinable node

Author: horakivo

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -994,7 +994,7 @@ boolean isInstanceVariableDefined(RubyDynamicObject object, Object name,
                 @CachedLibrary(limit = "getDynamicObjectCacheLimit()") DynamicObjectLibrary objectLibrary,
                 @Cached NameToJavaStringNode nameToJavaStringNode) {
             final String nameString = nameToJavaStringNode.execute(this, name);
-            checkIVarNameNode.execute(object, nameString, name);
+            checkIVarNameNode.execute(this, object, nameString, name);
             return objectLibrary.containsKey(object, nameString);
         }
 
@@ -1013,7 +1013,7 @@ Object instanceVariableGetSymbol(RubyDynamicObject object, Object name,
                 @CachedLibrary(limit = "getDynamicObjectCacheLimit()") DynamicObjectLibrary objectLibrary,
                 @Cached @Shared NameToJavaStringNode nameToJavaStringNode) {
             final String nameString = nameToJavaStringNode.execute(this, name);
-            checkIVarNameNode.execute(object, nameString, name);
+            checkIVarNameNode.execute(this, object, nameString, name);
             return objectLibrary.getOrDefault(object, nameString, nil);
         }
 
@@ -1022,7 +1022,7 @@ Object immutable(Object object, Object name,
                 @Cached @Shared CheckIVarNameNode checkIVarNameNode,
                 @Cached @Shared NameToJavaStringNode nameToJavaStringNode) {
             final String nameString = nameToJavaStringNode.execute(this, name);
-            checkIVarNameNode.execute(object, nameString, name);
+            checkIVarNameNode.execute(this, object, nameString, name);
             return nil;
         }
     }
@@ -1037,7 +1037,7 @@ Object instanceVariableSet(RubyDynamicObject object, Object name, Object value,
                 @Cached @Shared NameToJavaStringNode nameToJavaStringNode,
                 @Cached TypeNodes.CheckFrozenNode raiseIfFrozenNode) {
             final String nameString = nameToJavaStringNode.execute(this, name);
-            checkIVarNameNode.execute(object, nameString, name);
+            checkIVarNameNode.execute(this, object, nameString, name);
             raiseIfFrozenNode.execute(this, object);
             writeNode.execute(this, object, nameString, value);
             return value;
@@ -1048,7 +1048,7 @@ Object immutable(Object object, Object name, Object value,
                 @Cached @Shared CheckIVarNameNode checkIVarNameNode,
                 @Cached @Shared NameToJavaStringNode nameToJavaStringNode) {
             final String nameString = nameToJavaStringNode.execute(this, name);
-            checkIVarNameNode.execute(object, nameString, name);
+            checkIVarNameNode.execute(this, object, nameString, name);
             throw new RaiseException(getContext(), coreExceptions().frozenError(object, this));
         }
     }
@@ -1062,7 +1062,7 @@ Object removeInstanceVariable(RubyDynamicObject object, Object name,
                 @Cached @Shared NameToJavaStringNode nameToJavaStringNode,
                 @Cached TypeNodes.CheckFrozenNode raiseIfFrozenNode) {
             final String nameString = nameToJavaStringNode.execute(this, name);
-            checkIVarNameNode.execute(object, nameString, name);
+            checkIVarNameNode.execute(this, object, nameString, name);
             raiseIfFrozenNode.execute(this, object);
             return removeIVar(object, nameString);
         }
@@ -1072,7 +1072,7 @@ Object immutable(Object object, Object name,
                 @Cached @Shared CheckIVarNameNode checkIVarNameNode,
                 @Cached @Shared NameToJavaStringNode nameToJavaStringNode) {
             final String nameString = nameToJavaStringNode.execute(this, name);
-            checkIVarNameNode.execute(object, nameString, name);
+            checkIVarNameNode.execute(this, object, nameString, name);
             throw new RaiseException(getContext(), coreExceptions().frozenError(object, this));
         }
 

src/main/java/org/truffleruby/language/objects/CheckIVarNameNode.java

@@ -10,6 +10,9 @@
 package org.truffleruby.language.objects;
 
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.GenerateCached;
+import com.oracle.truffle.api.dsl.GenerateInline;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.language.RubyBaseNode;
@@ -22,40 +25,40 @@
 import com.oracle.truffle.api.dsl.Specialization;
 
 @ImportStatic(Identifiers.class)
+@GenerateInline
+@GenerateCached(false)
 public abstract class CheckIVarNameNode extends RubyBaseNode {
 
     /** Pass both the j.l.String name and the original name, the original name can be faster to check and the j.l.String
      * name is needed by all callers so it is better for footprint that callers convert to j.l.String */
-    public abstract void execute(Object object, String name, Object originalName);
+    public abstract void execute(Node node, Object object, String name, Object originalName);
 
     @Specialization
-    void checkSymbol(Object object, String name, RubySymbol originalName,
+    static void checkSymbol(Node node, Object object, String name, RubySymbol originalName,
             @Cached @Shared InlinedBranchProfile errorProfile) {
         if (originalName.getType() != IdentifierType.INSTANCE) {
-            errorProfile.enter(this);
-            throw new RaiseException(getContext(), getContext().getCoreExceptions().nameErrorInstanceNameNotAllowable(
-                    name,
-                    object,
-                    this));
+            errorProfile.enter(node);
+            throw new RaiseException(getContext(node),
+                    getContext(node).getCoreExceptions().nameErrorInstanceNameNotAllowable(name, object, node));
         }
     }
 
     @Specialization(
             guards = { "name == cachedName", "isValidInstanceVariableName(cachedName)", "!isRubySymbol(originalName)" },
             limit = "getDynamicObjectCacheLimit()")
-    void cached(Object object, String name, Object originalName,
+    static void cached(Object object, String name, Object originalName,
             @Cached("name") String cachedName) {
     }
 
     @Specialization(replaces = "cached", guards = "!isRubySymbol(originalName)")
-    void uncached(Object object, String name, Object originalName,
+    static void uncached(Node node, Object object, String name, Object originalName,
             @Cached @Shared InlinedBranchProfile errorProfile) {
         if (!Identifiers.isValidInstanceVariableName(name)) {
-            errorProfile.enter(this);
-            throw new RaiseException(getContext(), coreExceptions().nameErrorInstanceNameNotAllowable(
+            errorProfile.enter(node);
+            throw new RaiseException(getContext(node), coreExceptions(node).nameErrorInstanceNameNotAllowable(
                     name,
                     object,
-                    this));
+                    node));
         }
     }
 }