Convert HasLocalVariableNode to DSL inlinable

Author: horakivo

src/main/java/org/truffleruby/core/binding/BindingNodes.java

@@ -19,7 +19,6 @@
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Idempotent;
-import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.frame.FrameSlotKind;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.strings.TruffleString;
@@ -175,21 +174,18 @@ RubyBinding dup(RubyBinding binding) {
      * variables. */
     @ImportStatic({ BindingNodes.class, FindDeclarationVariableNodes.class })
     @GenerateUncached
+    @GenerateInline
+    @GenerateCached(false)
     public abstract static class HasLocalVariableNode extends RubyBaseNode {
 
-        @NeverDefault
-        public static HasLocalVariableNode create() {
-            return BindingNodesFactory.HasLocalVariableNodeGen.create();
-        }
-
-        public abstract boolean execute(RubyBinding binding, String name);
+        public abstract boolean execute(Node node, RubyBinding binding, String name);
 
         @Specialization(
                 guards = {
                         "name == cachedName",
                         "getFrameDescriptor(binding) == descriptor" },
                 limit = "getCacheLimit()")
-        boolean localVariableDefinedCached(RubyBinding binding, String name,
+        static boolean localVariableDefinedCached(RubyBinding binding, String name,
                 @Cached("name") String cachedName,
                 @Cached("getFrameDescriptor(binding)") FrameDescriptor descriptor,
                 @Cached("findFrameSlotOrNull(name, binding.getFrame())") FrameSlotAndDepth cachedFrameSlot) {
@@ -198,7 +194,7 @@ boolean localVariableDefinedCached(RubyBinding binding, String name,
 
         @TruffleBoundary
         @Specialization(replaces = "localVariableDefinedCached")
-        boolean localVariableDefinedUncached(RubyBinding binding, String name) {
+        static boolean localVariableDefinedUncached(RubyBinding binding, String name) {
             return FindDeclarationVariableNodes.findFrameSlotOrNull(name, binding.getFrame()) != null;
         }
 

src/main/java/org/truffleruby/debug/BindingLocalVariablesObject.java

@@ -81,8 +81,9 @@ protected void writeMember(String member, Object value,
     @ExportMessage(name = "isMemberReadable")
     @ExportMessage(name = "isMemberModifiable")
     protected boolean memberExists(String member,
-            @Cached @Exclusive BindingNodes.HasLocalVariableNode hasLocalVariableNode) {
-        return hasLocalVariableNode.execute(binding, member);
+            @Cached @Exclusive BindingNodes.HasLocalVariableNode hasLocalVariableNode,
+            @Bind("$node") Node node) {
+        return hasLocalVariableNode.execute(node, binding, member);
     }
 
     @ExportMessage

src/main/java/org/truffleruby/debug/RubyScope.java

@@ -154,8 +154,9 @@ static boolean readSelf(RubyScope scope, String member) {
 
         @Specialization(guards = "!RECEIVER_MEMBER.equals(member)")
         static boolean isMemberReadable(RubyScope scope, String member,
-                @Cached @Exclusive BindingNodes.HasLocalVariableNode hasLocalVariableNode) {
-            return hasLocalVariableNode.execute(scope.binding, member);
+                @Cached @Exclusive BindingNodes.HasLocalVariableNode hasLocalVariableNode,
+                @Bind("this") Node node) {
+            return hasLocalVariableNode.execute(node, scope.binding, member);
         }
     }
 
@@ -168,8 +169,9 @@ static boolean readSelf(RubyScope scope, String member) {
 
         @Specialization(guards = "!RECEIVER_MEMBER.equals(member)")
         static boolean isMemberModifiable(RubyScope scope, String member,
-                @Cached @Exclusive BindingNodes.HasLocalVariableNode hasLocalVariableNode) {
-            return hasLocalVariableNode.execute(scope.binding, member);
+                @Cached @Exclusive BindingNodes.HasLocalVariableNode hasLocalVariableNode,
+                @Bind("this") Node node) {
+            return hasLocalVariableNode.execute(node, scope.binding, member);
         }
     }