Avoid and remove EncodingManager.charsetForEncoding()

* That does not handle binary source encoding, even if all bytes are US-ASCII.

Author: eregon

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

@@ -26,7 +26,6 @@
 import org.graalvm.nativeimage.ProcessProperties;
 import org.jcodings.Encoding;
 import org.jcodings.EncodingDB;
-import org.jcodings.specific.ASCIIEncoding;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.SuppressFBWarnings;
@@ -293,14 +292,6 @@ public synchronized RubyEncoding replicateEncoding(RubyEncoding encoding, String
         return defineDynamicEncoding(encoding.jcoding, nameBytes);
     }
 
-    @TruffleBoundary
-    public static Charset charsetForEncoding(Encoding encoding) {
-        if (encoding == ASCIIEncoding.INSTANCE) {
-            throw new UnsupportedOperationException("Cannot return a Charset for the BINARY Ruby Encoding");
-        }
-        return encoding.getCharset();
-    }
-
     public RubyEncoding getLocaleEncoding() {
         return localeEncoding;
     }

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

@@ -130,6 +130,10 @@ public static boolean isSingleByteOptimizable(AbstractTruffleString truffleStrin
         return truffleString.getByteCodeRangeUncached(encoding.tencoding) == ASCII || encoding.isSingleByte;
     }
 
+    public static String toJavaStringOrThrow(byte[] bytes, RubyEncoding encoding) {
+        return toJavaStringOrThrow(fromByteArray(bytes, encoding), encoding);
+    }
+
     public static String toJavaStringOrThrow(AbstractTruffleString tstring, RubyEncoding encoding) {
         CompilerAsserts.neverPartOfCompilation("uncached");
         if (encoding == Encodings.BINARY && !StringGuards.is7BitUncached(tstring, encoding)) {

src/main/java/org/truffleruby/language/loader/FeatureLoader.java

@@ -23,14 +23,13 @@
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
-import org.jcodings.Encoding;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.collections.ConcurrentOperations;
 import org.truffleruby.core.array.ArrayOperations;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.array.RubyArray;
-import org.truffleruby.core.encoding.EncodingManager;
+import org.truffleruby.core.encoding.TStringUtils;
 import org.truffleruby.core.module.RubyModule;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringOperations;
@@ -222,8 +221,8 @@ private String initializeWorkingDirectory() {
                     context,
                     InteropLibrary.getUncached(),
                     0);
-            final Encoding localeEncoding = context.getEncodingManager().getLocaleEncoding().jcoding;
-            return new String(bytes, EncodingManager.charsetForEncoding(localeEncoding));
+            var localeEncoding = context.getEncodingManager().getLocaleEncoding();
+            return TStringUtils.toJavaStringOrThrow(bytes, localeEncoding);
         } finally {
             rubyThread.getIoBuffer(context).free(null, rubyThread, buffer, InlinedConditionProfile.getUncached());
         }

src/main/java/org/truffleruby/parser/YARPTranslator.java

@@ -20,7 +20,6 @@
 import org.truffleruby.core.cast.StringToSymbolNodeGen;
 import org.truffleruby.core.cast.ToSNode;
 import org.truffleruby.core.cast.ToSNodeGen;
-import org.truffleruby.core.encoding.EncodingManager;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.encoding.TStringUtils;
@@ -193,7 +192,7 @@ public RubyNode visitBreakNode(Nodes.BreakNode node) {
     }
 
     public RubyNode visitCallNode(Nodes.CallNode node) {
-        var methodName = new String(node.name, EncodingManager.charsetForEncoding(sourceEncoding.jcoding));
+        var methodName = TStringUtils.toJavaStringOrThrow(node.name, sourceEncoding);
         var receiver = node.receiver == null ? new SelfNode() : node.receiver.accept(this);
         var arguments = node.arguments.arguments;
 
@@ -757,10 +756,9 @@ public RubyNode visitStringConcatNode(Nodes.StringConcatNode node) {
     }
 
     public RubyNode visitStringNode(Nodes.StringNode node) {
-        final RubyEncoding encoding = sourceEncoding;
-        final TruffleString tstring = TStringUtils.fromByteArray(node.unescaped, encoding);
-        final TruffleString cachedTString = language.tstringCache.getTString(tstring, encoding);
-        final RubyNode rubyNode = new StringLiteralNode(cachedTString, encoding);
+        final TruffleString tstring = TStringUtils.fromByteArray(node.unescaped, sourceEncoding);
+        final TruffleString cachedTString = language.tstringCache.getTString(tstring, sourceEncoding);
+        final RubyNode rubyNode = new StringLiteralNode(cachedTString, sourceEncoding);
 
         assignNodePositionInSource(node, rubyNode);
 
@@ -772,7 +770,8 @@ public RubyNode visitSuperNode(Nodes.SuperNode node) {
     }
 
     public RubyNode visitSymbolNode(Nodes.SymbolNode node) {
-        final RubySymbol symbol = language.getSymbol(toString(node));
+        var tstring = TStringUtils.fromByteArray(node.unescaped, sourceEncoding);
+        final RubySymbol symbol = language.getSymbol(tstring, sourceEncoding);
         final RubyNode rubyNode = new ObjectLiteralNode(symbol);
 
         assignNodePositionInSource(node, rubyNode);
@@ -874,17 +873,11 @@ protected RubyContextSourceNode createCallNode(RubyNode receiver, String method,
     }
 
     private String toString(Nodes.Location location) {
-        return new String(sourceBytes, location.startOffset, location.length,
-                EncodingManager.charsetForEncoding(sourceEncoding.jcoding));
+        return TStringUtils.toJavaStringOrThrow(TruffleString.fromByteArrayUncached(sourceBytes, location.startOffset, location.length, sourceEncoding.tencoding, false), sourceEncoding);
     }
 
     private String toString(Nodes.Node node) {
-        return new String(sourceBytes, node.startOffset, node.length,
-                EncodingManager.charsetForEncoding(sourceEncoding.jcoding));
-    }
-
-    private String toString(Nodes.SymbolNode node) {
-        return new String(node.unescaped, EncodingManager.charsetForEncoding(sourceEncoding.jcoding));
+        return TStringUtils.toJavaStringOrThrow(TruffleString.fromByteArrayUncached(sourceBytes, node.startOffset, node.length, sourceEncoding.tencoding, false), sourceEncoding);
     }
 
     private SourceSection getSourceSection(Nodes.Node yarpNode) {