Move getJavaString()/asTruffleStringUncached() out of RubyGuards to StringOperations

Author: andrykonchin

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -73,6 +73,7 @@
 import org.truffleruby.core.numeric.RubyBignum;
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.string.RubyString;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.string.StringSupport;
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.core.string.TStringWithEncoding;
@@ -1472,7 +1473,7 @@ Object debug(Object... objects) {
 
                     representation = tstring + " (" + builder + ")";
                 } else if (RubyGuards.isRubyValue(object)) {
-                    representation = object.toString() + " (" + RubyGuards.getJavaString(callToS(object)) + ")";
+                    representation = object.toString() + " (" + StringOperations.getJavaString(callToS(object)) + ")";
                 } else {
                     representation = object.toString();
                 }

src/main/java/org/truffleruby/core/TruffleSystemNodes.java

@@ -60,10 +60,10 @@
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.string.RubyString;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.interop.FromJavaStringNode;
 import org.truffleruby.interop.ToJavaStringNode;
-import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.shared.Platform;
@@ -133,7 +133,7 @@ Object setTruffleWorkingDir(Object dir,
                 @Cached RubyStringLibrary stringsDir) {
             TruffleFile truffleFile = getContext()
                     .getEnv()
-                    .getPublicTruffleFile(RubyGuards.getJavaString(dir));
+                    .getPublicTruffleFile(StringOperations.getJavaString(dir));
             final TruffleFile canonicalFile;
             try {
                 canonicalFile = truffleFile.getCanonicalFile();

src/main/java/org/truffleruby/core/VMPrimitiveNodes.java

@@ -68,12 +68,12 @@
 import org.truffleruby.core.proc.ProcOperations;
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.string.RubyString;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.support.RubyIO;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.core.thread.RubyThread;
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.interop.TranslateInteropExceptionNode;
-import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.SafepointAction;
 import org.truffleruby.language.arguments.ArgumentsDescriptor;
 import org.truffleruby.language.arguments.NoKeywordArgumentsDescriptor;
@@ -279,8 +279,8 @@ public abstract static class VMWatchSignalNode extends PrimitiveArrayArgumentsNo
         boolean watchSignalString(Object signalString, boolean isRubyDefaultHandler, Object action,
                 @Cached @Shared RubyStringLibrary libSignalString,
                 @Cached @Exclusive RubyStringLibrary libAction) {
-            final String actionString = RubyGuards.getJavaString(action);
-            final String signalName = RubyGuards.getJavaString(signalString);
+            final String actionString = StringOperations.getJavaString(action);
+            final String signalName = StringOperations.getJavaString(signalString);
 
             switch (actionString) {
                 case "DEFAULT":
@@ -305,7 +305,7 @@ boolean watchSignalProc(Object signalString, boolean isRubyDefaultHandler, RubyP
                 SharedObjects.writeBarrier(getLanguage(), proc);
             }
 
-            final String signalName = RubyGuards.getJavaString(signalString);
+            final String signalName = StringOperations.getJavaString(signalString);
 
             return registerHandler(signalName, signal -> {
                 var rootThread = context.getThreadManager().getRootThread();
@@ -395,7 +395,7 @@ public abstract static class VMGetConfigItemNode extends PrimitiveArrayArguments
         @TruffleBoundary
         @Specialization
         Object get(Object key) {
-            final String keyString = RubyGuards.getJavaString(key);
+            final String keyString = StringOperations.getJavaString(key);
             final Object value = getContext().getNativeConfiguration().get(keyString);
 
             if (value == null) {
@@ -417,7 +417,7 @@ Object getSection(Object section, RubyProc block,
                 @Cached CallBlockNode yieldNode) {
             for (Entry<String, Object> entry : getContext()
                     .getNativeConfiguration()
-                    .getSection(RubyGuards.getJavaString(section))) {
+                    .getSection(StringOperations.getJavaString(section))) {
                 final RubyString key = createString(fromJavaStringNode, entry.getKey(), Encodings.UTF_8); // CR_7BIT
                 yieldNode.yield(this, block, key, entry.getValue());
             }
@@ -576,7 +576,7 @@ public abstract static class ShouldNotReachHereNode extends PrimitiveArrayArgume
         Object shouldNotReachHere(Object message,
                 @Cached RubyStringLibrary libString) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw CompilerDirectives.shouldNotReachHere(RubyGuards.getJavaString(message));
+            throw CompilerDirectives.shouldNotReachHere(StringOperations.getJavaString(message));
         }
 
     }

src/main/java/org/truffleruby/core/array/ArrayNodes.java

@@ -71,6 +71,7 @@
 import org.truffleruby.core.range.RangeNodes.NormalizedStartLengthNode;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringHelperNodes;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.support.TypeNodes.CheckFrozenNode;
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.interop.ToJavaStringNode;
@@ -1524,6 +1525,7 @@ RubyString pack(RubyArray array, Object format, Object buffer,
     @GenerateCached(false)
     @GenerateInline
     @ReportPolymorphism // inline cache, CallTarget cache
+    @ImportStatic(StringOperations.class)
     public abstract static class PackNode extends RubyBaseNode {
 
         public abstract RubyString execute(Node node, RubyArray array, Object format, Object buffer);

src/main/java/org/truffleruby/core/cast/ToCallTargetNode.java

@@ -17,12 +17,12 @@
 import org.truffleruby.core.method.RubyMethod;
 import org.truffleruby.core.method.RubyUnboundMethod;
 import org.truffleruby.core.proc.RubyProc;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.string.TStringWithEncoding;
 import org.truffleruby.language.RubyBaseNode;
 
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.dsl.Specialization;
-import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.loader.ByteBasedCharSequence;
 import org.truffleruby.parser.ParserContext;
@@ -53,7 +53,7 @@ static RootCallTarget proc(RubyProc proc) {
     @TruffleBoundary
     @Specialization
     static RootCallTarget string(Node node, Object string) {
-        var code = new TStringWithEncoding(RubyGuards.asTruffleStringUncached(string),
+        var code = new TStringWithEncoding(StringOperations.asTruffleStringUncached(string),
                 RubyStringLibrary.getEncodingUncached(string));
         Source source = Source.newBuilder("ruby", new ByteBasedCharSequence(code), "<parse_ast>").build();
         TranslatorEnvironment.resetTemporaryVariablesIndex();

src/main/java/org/truffleruby/core/cast/ToSymbolNode.java

@@ -13,11 +13,13 @@
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.string.StringHelperNodes;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.symbol.RubySymbol;
 
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -30,6 +32,7 @@
 @GenerateUncached
 @GenerateCached
 @GenerateInline(inlineByDefault = true)
+@ImportStatic(StringOperations.class)
 public abstract class ToSymbolNode extends RubyBaseNode {
 
     public final RubySymbol executeCached(Object object) {

src/main/java/org/truffleruby/core/encoding/EncodingNodes.java

@@ -35,11 +35,11 @@
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringGuards;
 import org.truffleruby.core.string.ImmutableRubyString;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.interop.ToJavaStringNode;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyBaseNode;
-import org.truffleruby.language.RubyGuards;
 import org.truffleruby.annotations.Visibility;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.library.RubyStringLibrary;
@@ -446,7 +446,7 @@ public abstract static class GetDefaultEncodingNode extends PrimitiveArrayArgume
         @TruffleBoundary
         @Specialization
         Object getDefaultEncoding(Object name) {
-            final RubyEncoding encoding = getEncoding(RubyGuards.getJavaString(name));
+            final RubyEncoding encoding = getEncoding(StringOperations.getJavaString(name));
             if (encoding == null) {
                 return nil;
             } else {

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

@@ -34,7 +34,6 @@
 import org.truffleruby.core.fiber.FiberNodes.FiberGetExceptionNode;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyBaseNode;
-import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.backtrace.Backtrace;
 import org.truffleruby.language.backtrace.BacktraceFormatter;
 import org.truffleruby.language.backtrace.BacktraceFormatter.FormattingFlags;
@@ -90,7 +89,7 @@ public void showExceptionIfDebug(RubyClass rubyClass, Object message, Backtrace
                 from = " at " + debugBacktraceFormatter.formatLine(backtrace.getStackTrace(), 0, null);
             }
             if (RubyStringLibrary.isRubyStringUncached(message)) {
-                message = RubyGuards.getJavaString(message);
+                message = StringOperations.getJavaString(message);
             }
             final String output = "Exception `" + exceptionClass + "'" + from + " - " + message + "\n";
             if (context.getCoreLibrary().isLoaded()) {
@@ -108,21 +107,21 @@ public void showExceptionIfDebug(RubyClass rubyClass, Object message, Backtrace
     public String inspect(Object value) {
         Object rubyString = DispatchNode.getUncached().call(
                 context.getCoreLibrary().truffleTypeModule, "rb_inspect", value);
-        return RubyGuards.getJavaString(rubyString);
+        return StringOperations.getJavaString(rubyString);
     }
 
     @TruffleBoundary
     public String inspectReceiver(Object receiver) {
         Object rubyString = DispatchNode.getUncached().call(
                 context.getCoreLibrary().truffleExceptionOperationsModule, "receiver_string", receiver);
-        return RubyGuards.getJavaString(rubyString);
+        return StringOperations.getJavaString(rubyString);
     }
 
     @TruffleBoundary
     public String inspectFrozenObject(Object object) {
         Object rubyString = DispatchNode.getUncached().call(
                 context.getCoreLibrary().truffleExceptionOperationsModule, "inspect_frozen_object", object);
-        return RubyGuards.getJavaString(rubyString);
+        return StringOperations.getJavaString(rubyString);
     }
 
     // ArgumentError
@@ -703,7 +702,8 @@ public RubyException typeErrorUnsupportedTypeException(UnsupportedTypeException
         String message = exception.getMessage();
         if (message == null) {
             RubyArray rubyArray = createArray(context, language, exception.getSuppliedValues());
-            String formattedValues = RubyGuards.getJavaString(DispatchNode.getUncached().call(rubyArray, "inspect"));
+            String formattedValues = StringOperations
+                    .getJavaString(DispatchNode.getUncached().call(rubyArray, "inspect"));
             message = "unsupported type " + formattedValues;
         }
         return typeError(message, currentNode);

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

@@ -20,9 +20,9 @@
 import org.truffleruby.core.module.ModuleFields;
 import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.core.proc.RubyProc;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyConstant;
-import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.backtrace.Backtrace;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -108,7 +108,7 @@ public static String messageFieldToString(RubyException exception) {
             final ModuleFields exceptionClass = exception.getLogicalClass().fields;
             return exceptionClass.getName(); // What Exception#message would return if no message is set
         } else if (RubyStringLibrary.isRubyStringUncached(message)) {
-            return RubyGuards.getJavaString(message);
+            return StringOperations.getJavaString(message);
         } else {
             return message.toString();
         }
@@ -123,7 +123,7 @@ public static String messageToString(RubyException exception) {
             // Fall back to the internal message field
         }
         if (messageObject != null && RubyStringLibrary.isRubyStringUncached(messageObject)) {
-            return RubyGuards.getJavaString(messageObject);
+            return StringOperations.getJavaString(messageObject);
         } else {
             return messageFieldToString(exception);
         }

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

@@ -10,7 +10,7 @@
 package org.truffleruby.core.exception;
 
 import org.truffleruby.core.klass.RubyClass;
-import org.truffleruby.language.RubyGuards;
+import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.language.backtrace.Backtrace;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -50,7 +50,7 @@ public ExceptionType getExceptionType() {
     @ExportMessage
     public boolean isExceptionIncompleteSource() {
         if (RubyStringLibrary.isRubyStringUncached(message)) {
-            String messageString = RubyGuards.getJavaString(message);
+            String messageString = StringOperations.getJavaString(message);
             return messageString.endsWith(" unexpected end-of-file") ||
                     messageString.endsWith(" meets end of file");
         } else {