Remove unnecessary usages of RubyContextSourceNode

Author: eregon

src/main/java/org/truffleruby/core/exception/CoreExceptions.java

@@ -266,7 +266,7 @@ public RubyException argumentError(Rope message, RubyEncoding encoding, Node cur
         return ExceptionOperations.createRubyException(
                 context,
                 exceptionClass,
-                StringOperations.createString(context, language, message, encoding),
+                StringOperations.createString(currentNode, message, encoding),
                 currentNode,
                 javaThrowable);
     }

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

@@ -45,7 +45,7 @@ public InterpolatedStringNode(ToSNode[] children, Encoding encoding, boolean fro
     public Object execute(VirtualFrame frame) {
 
         // Start with an empty string to ensure the result has class String and the proper encoding.
-        RubyString builder = StringOperations.createString(getContext(), getLanguage(), emptyRope, encoding);
+        RubyString builder = StringOperations.createString(this, emptyRope, encoding);
 
         // TODO (nirvdrum 11-Jan-16) Rewrite to avoid massively unbalanced trees.
         for (ToSNode child : children) {

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

@@ -596,7 +596,7 @@ protected Object concatMany(RubyString string, Object first, Object[] rest,
             Object result = argConcatNode.executeConcat(string, first, EMPTY_ARGUMENTS);
             for (int i = 0; i < cachedLength; ++i) {
                 final Object argOrCopy = selfArgProfile.profile(rest[i] == string)
-                        ? createString(getContext(), getLanguage(), rope, string.encoding)
+                        ? createString(this, rope, string.encoding)
                         : rest[i];
                 result = argConcatNode.executeConcat(string, argOrCopy, EMPTY_ARGUMENTS);
             }
@@ -612,7 +612,7 @@ protected Object concatManyGeneral(RubyString string, Object first, Object[] res
             Object result = argConcatNode.executeConcat(string, first, EMPTY_ARGUMENTS);
             for (Object arg : rest) {
                 if (selfArgProfile.profile(arg == string)) {
-                    Object copy = createString(getContext(), getLanguage(), rope, string.encoding);
+                    Object copy = createString(this, rope, string.encoding);
                     result = argConcatNode.executeConcat(string, copy, EMPTY_ARGUMENTS);
                 } else {
                     result = argConcatNode.executeConcat(string, arg, EMPTY_ARGUMENTS);

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

@@ -28,6 +28,7 @@
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 
+import com.oracle.truffle.api.nodes.Node;
 import org.jcodings.Encoding;
 import org.jcodings.specific.ASCIIEncoding;
 import org.truffleruby.RubyContext;
@@ -41,33 +42,32 @@
 import org.truffleruby.core.rope.RopeOperations;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.objects.AllocationTracing;
 
 public abstract class StringOperations {
 
-    public static RubyString createString(RubyContextSourceNode node, Rope rope, RubyEncoding encoding) {
+    public static RubyString createUTF8String(RubyContext context, RubyLanguage language, Rope rope) {
         final RubyString instance = new RubyString(
-                node.getContext().getCoreLibrary().stringClass,
-                node.getLanguage().stringShape,
+                context.getCoreLibrary().stringClass,
+                language.stringShape,
                 false,
                 rope,
-                encoding);
-        AllocationTracing.trace(instance, node);
+                Encodings.UTF_8);
         return instance;
     }
 
-    public static RubyString createUTF8String(RubyContext context, RubyLanguage language, Rope rope) {
+    public static RubyString createString(Node node, Rope rope, RubyEncoding encoding) {
         final RubyString instance = new RubyString(
-                context.getCoreLibrary().stringClass,
-                language.stringShape,
+                RubyContext.get(node).getCoreLibrary().stringClass,
+                RubyLanguage.get(node).stringShape,
                 false,
                 rope,
-                Encodings.UTF_8);
+                encoding);
+        AllocationTracing.trace(instance, node);
         return instance;
     }
 
-    // TODO BJF Aug-3-2020 Trace more allocations of RubyString
+    /** Only use when there is no Node to report the allocation */
     public static RubyString createString(RubyContext context, RubyLanguage language, Rope rope,
             RubyEncoding encoding) {
         final RubyString instance = new RubyString(

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

@@ -14,7 +14,7 @@
 
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-/** Has both context and source methods. */
+/** See {@link RubyNode} */
 public abstract class RubyContextSourceNode extends RubyNode {
 
     private int sourceCharIndex = NO_SOURCE;

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

@@ -44,7 +44,7 @@ public Object execute(VirtualFrame frame) {
                 .send(
                         interactiveBinding,
                         "eval",
-                        StringOperations.createString(context, language, sourceRope, Encodings.UTF_8));
+                        StringOperations.createString(this, sourceRope, Encodings.UTF_8));
     }
 
     @Override

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

@@ -39,9 +39,11 @@
 
 import static org.truffleruby.debug.RubyScope.RECEIVER_MEMBER;
 
-/** RubyNode has source, execute, and is instrument-able. However, it does not have any fields which would prevent
- * using @GenerateUncached. It should never be subclassed directly, either use {@link RubyContextSourceNode} or
- * {@link RubySourceNode}. SourceRubyNode is not defined since there was no use for it for now. */
+/** 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. */
 @GenerateWrapper
 @ExportLibrary(NodeLibrary.class)
 public abstract class RubyNode extends RubyBaseNodeWithExecute implements InstrumentableNode {

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

@@ -15,7 +15,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import org.truffleruby.RubyLanguage;
 
-/** Can be used as a parent of Ruby nodes which need @GenerateUncached. */
+/** Can be used as a parent of Ruby nodes which need source and @GenerateUncached. */
 @NodeField(name = "sourceCharIndex", type = int.class)
 @NodeField(name = "sourceLength", type = int.class)
 @NodeField(name = "flags", type = byte.class)

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

@@ -21,7 +21,6 @@
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.LexicalScope;
-import org.truffleruby.language.RubyContextSourceNode;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.arguments.RubyArguments;
 
@@ -88,7 +87,7 @@ private static void traceBoundary(RubyContext context, RubyDynamicObject object,
 
     @TruffleBoundary
     private static void traceInlineBoundary(RubyContext context, RubyDynamicObject instance, String className,
-            String allocatingMethod, RubyContextSourceNode node) {
+            String allocatingMethod, Node node) {
         final ObjectSpaceManager objectSpaceManager = context.getObjectSpaceManager();
         if (!objectSpaceManager.isTracingPaused()) {
             objectSpaceManager.setTracingPaused(true);
@@ -125,7 +124,7 @@ private static void callTraceAllocation(RubyContext context, RubyDynamicObject o
 
     @TruffleBoundary
     private static void callTraceInlineAllocation(RubyContext context, RubyDynamicObject instance, String className,
-            String allocatingMethod, RubyContextSourceNode node) {
+            String allocatingMethod, Node node) {
         final SourceSection allocatingSourceSection = context
                 .getCallStack()
                 .getTopMostUserSourceSection(node.getEncapsulatingSourceSection());

src/main/java/org/truffleruby/stdlib/digest/DigestNodes.java

@@ -22,7 +22,7 @@
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringNodes;
-import org.truffleruby.language.RubyContextSourceNode;
+import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.objects.AllocationTracing;
 
@@ -41,7 +41,7 @@ private static MessageDigest getMessageDigestInstance(String name) {
         }
     }
 
-    private static RubyDigest createDigest(RubyContextSourceNode node, DigestAlgorithm algorithm) {
+    private static RubyDigest createDigest(RubyBaseNode node, DigestAlgorithm algorithm) {
         final RubyDigest instance = new RubyDigest(
                 node.getContext().getCoreLibrary().digestClass,
                 node.getLanguage().digestShape,