Removing RubySourceNode

Author: horakivo

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

@@ -15,7 +15,6 @@
 import java.util.Set;
 
 import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.NeverDefault;
@@ -38,7 +37,6 @@
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyBaseNodeWithExecute;
 import org.truffleruby.language.RubyNode;
-import org.truffleruby.language.RubySourceNode;
 import org.truffleruby.language.arguments.RubyArguments;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.locals.FindDeclarationVariableNodes;

src/main/java/org/truffleruby/interop/InteropNodes.java

@@ -18,7 +18,6 @@
 import java.util.Map;
 
 import com.oracle.truffle.api.dsl.Bind;
-import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.ExceptionType;
 import com.oracle.truffle.api.interop.NodeLibrary;
@@ -50,7 +49,6 @@
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.RubyNode;
-import org.truffleruby.language.RubySourceNode;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.library.RubyStringLibrary;
@@ -65,7 +63,6 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.CreateCast;
-import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeChild;

src/main/java/org/truffleruby/language/RubyNode.java

@@ -42,9 +42,9 @@
 
 /** RubyNode has source, execute, and is instrument-able. If there is no need for source and instrument-able,
  * {@link RubyBaseNode} or {@link RubyBaseNodeWithExecute} should be used instead to save footprint. RubyNode does not
- * have any fields which would prevent using @GenerateUncached. It should never be subclassed directly, either use
- * {@link RubyContextSourceNode} (cannot be uncached, but avoids the DSL generating 6 field accessors for each subclass)
- * or {@link RubySourceNode} (can be uncached). SourceRubyNode is not defined since there was no use for it for now. */
+ * have any fields which would prevent using @GenerateUncached. It should never be subclassed directly, use
+ * {@link RubyContextSourceNode} (cannot be uncached, but avoids the DSL generating 6 field accessors for each
+ * subclass). SourceRubyNode is not defined since there was no use for it for now. */
 @GenerateWrapper
 @ExportLibrary(NodeLibrary.class)
 public abstract class RubyNode extends RubyBaseNodeWithExecute implements InstrumentableNode {

src/main/java/org/truffleruby/language/RubySourceNode.java

@@ -98,7 +98,6 @@ public class CoreModuleProcessor extends TruffleRubyProcessor {
     TypeMirror primitiveNodeType;
     TypeMirror coreMethodNodeType;
     TypeMirror alwaysInlinedMethodNodeType;
-    TypeMirror rubySourceNodeType;
 
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnvironment) {
@@ -115,7 +114,6 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
         coreMethodNodeType = elementUtils.getTypeElement("org.truffleruby.builtins.CoreMethodNode").asType();
         alwaysInlinedMethodNodeType = elementUtils
                 .getTypeElement("org.truffleruby.core.inlined.AlwaysInlinedMethodNode").asType();
-        rubySourceNodeType = elementUtils.getTypeElement("org.truffleruby.language.RubySourceNode").asType();
 
 
         if (!annotations.isEmpty()) {
@@ -200,10 +198,9 @@ private void processCoreModule(TypeElement coreModuleElement) throws IOException
                                             : null;
                             coreModuleChecks.checks(coreMethod.lowerFixnum(), checkAmbiguous, klass, needsSelf);
                             if (!inherits(e.asType(), coreMethodNodeType) &&
-                                    !inherits(e.asType(), alwaysInlinedMethodNodeType) &&
-                                    !inherits(e.asType(), rubySourceNodeType)) {
+                                    !inherits(e.asType(), alwaysInlinedMethodNodeType)) {
                                 error(e +
-                                        " should inherit from CoreMethodArrayArgumentsNode, CoreMethodNode, AlwaysInlinedMethodNode or RubySourceNode",
+                                        " should inherit from CoreMethodArrayArgumentsNode, CoreMethodNode, AlwaysInlinedMethodNode",
                                         e);
                             }
                             processCoreMethod(stream, rubyStream, coreModuleElement, coreModule, klass, coreMethod,
@@ -225,9 +222,9 @@ private void processCoreModule(TypeElement coreModuleElement) throws IOException
                         if (primitive != null) {
                             processPrimitive(stream, rubyPrimitives, coreModuleElement, klass, primitive);
                             coreModuleChecks.checks(primitive.lowerFixnum(), null, klass, true);
-                            if (!inherits(e.asType(), primitiveNodeType) && !inherits(e.asType(), rubySourceNodeType)) {
+                            if (!inherits(e.asType(), primitiveNodeType)) {
                                 error(e +
-                                        " should inherit from PrimitiveArrayArgumentsNode, PrimitiveNode or RubySourceNode",
+                                        " should inherit from PrimitiveArrayArgumentsNode, PrimitiveNode",
                                         e);
                             }
                         }