Replacing RubySourceNode with CoreMethodNode

Author: horakivo

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

@@ -29,6 +29,7 @@
 import org.truffleruby.annotations.Primitive;
 import org.truffleruby.annotations.Visibility;
 import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
+import org.truffleruby.builtins.CoreMethodNode;
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
 import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
@@ -282,11 +283,7 @@ public RubyNode cloneUninitialized() {
     @NodeChild(value = "bindingNode", type = RubyNode.class)
     @NodeChild(value = "nameNode", type = RubyBaseNodeWithExecute.class)
     @ImportStatic(BindingNodes.class)
-    public abstract static class BindingLocalVariableGetNode extends RubySourceNode {
-
-        abstract RubyNode getBindingNode();
-
-        abstract RubyBaseNodeWithExecute getNameNode();
+    public abstract static class BindingLocalVariableGetNode extends CoreMethodNode {
 
         @CreateCast("nameNode")
         protected RubyBaseNodeWithExecute coerceToString(RubyBaseNodeWithExecute name) {
@@ -298,17 +295,6 @@ protected Object localVariableGet(RubyBinding binding, String name,
                 @Cached LocalVariableGetNode localVariableGetNode) {
             return localVariableGetNode.execute(binding, name);
         }
-
-        private RubyBaseNodeWithExecute getNameNodeBeforeCasting() {
-            return ((NameToJavaStringNode) getNameNode()).getValueNode();
-        }
-
-        @Override
-        public RubyNode cloneUninitialized() {
-            return BindingNodesFactory.BindingLocalVariableGetNodeFactory.create(
-                    getBindingNode().cloneUninitialized(),
-                    getNameNodeBeforeCasting().cloneUninitialized()).copyFlags(this);
-        }
     }
 
     @GenerateUncached
@@ -345,13 +331,7 @@ protected Object localVariableGetLastLine(RubyBinding binding, String name) {
     @NodeChild(value = "bindingNode", type = RubyNode.class)
     @NodeChild(value = "nameNode", type = RubyBaseNodeWithExecute.class)
     @NodeChild(value = "valueNode", type = RubyNode.class)
-    public abstract static class BindingLocalVariableSetNode extends RubySourceNode {
-
-        abstract RubyNode getBindingNode();
-
-        abstract RubyBaseNodeWithExecute getNameNode();
-
-        abstract RubyNode getValueNode();
+    public abstract static class BindingLocalVariableSetNode extends CoreMethodNode {
 
         @CreateCast("nameNode")
         protected RubyBaseNodeWithExecute coerceToString(RubyBaseNodeWithExecute name) {
@@ -363,18 +343,6 @@ protected Object localVariableSet(RubyBinding binding, String name, Object value
                 @Cached LocalVariableSetNode localVariableSetNode) {
             return localVariableSetNode.execute(binding, name, value);
         }
-
-        private RubyBaseNodeWithExecute getNameNodeBeforeCasting() {
-            return ((NameToJavaStringNode) getNameNode()).getValueNode();
-        }
-
-        @Override
-        public RubyNode cloneUninitialized() {
-            return BindingNodesFactory.BindingLocalVariableSetNodeFactory.create(
-                    getBindingNode().cloneUninitialized(),
-                    getNameNodeBeforeCasting().cloneUninitialized(),
-                    getValueNode().cloneUninitialized()).copyFlags(this);
-        }
     }
 
 
@@ -394,7 +362,7 @@ public abstract static class LocalVariableSetNode extends RubyBaseNode {
         protected Object localVariableSetCached(RubyBinding binding, String name, Object value,
                 @Cached("name") String cachedName,
                 @Cached("getFrameDescriptor(binding)") FrameDescriptor cachedFrameDescriptor,
-                @Cached("findFrameSlotOrNull(name, binding.getFrame())") FindDeclarationVariableNodes.FrameSlotAndDepth cachedFrameSlot,
+                @Cached("findFrameSlotOrNull(name, binding.getFrame())") FrameSlotAndDepth cachedFrameSlot,
                 @Cached("createWriteNode(cachedFrameSlot.slot)") WriteFrameSlotNode writeLocalVariableNode) {
             final MaterializedFrame frame = RubyArguments
                     .getDeclarationFrame(binding.getFrame(), cachedFrameSlot.depth);

src/main/java/org/truffleruby/core/string/StringNodes.java

@@ -150,7 +150,6 @@
 import org.truffleruby.language.RubyBaseNodeWithExecute;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.RubyNode;
-import org.truffleruby.language.RubySourceNode;
 import org.truffleruby.annotations.Visibility;
 import org.truffleruby.language.arguments.ReadCallerVariablesNode;
 import org.truffleruby.language.control.DeferredRaiseException;
@@ -186,23 +185,13 @@ public abstract class StringNodes {
     @GenerateNodeFactory
     @CoreMethod(names = { "__allocate__", "__layout_allocate__" }, constructor = true, visibility = Visibility.PRIVATE)
     @NodeChild(value = "rubyClassNode", type = RubyNode.class)
-    public abstract static class StringAllocateNode extends RubySourceNode {
-
-        abstract RubyNode getRubyClassNode();
+    public abstract static class StringAllocateNode extends CoreMethodNode {
 
         @Specialization
         protected RubyString allocate(RubyClass rubyClass,
                 @Cached AllocateNode allocateNode) {
             return allocateNode.execute(rubyClass);
         }
-
-
-        @Override
-        public RubyNode cloneUninitialized() {
-            return StringNodesFactory.StringAllocateNodeFactory.create(getRubyClassNode().cloneUninitialized())
-                    .copyFlags(this);
-        }
-
     }
 
     @GenerateUncached