Review usages of StringOperations.encodeAsciiBytes()

Author: andrykonchin

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

@@ -30,7 +30,6 @@
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.core.string.EncodingUtils;
-import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.platform.NativeConfiguration;
 import org.truffleruby.platform.TruffleNFIPlatform;
@@ -221,7 +220,7 @@ public void defineBuiltInEncoding(RubyEncoding rubyEncoding) {
     }
 
     @TruffleBoundary
-    public synchronized RubyEncoding defineDynamicEncoding(Encoding encoding, byte[] name) {
+    public synchronized RubyEncoding defineDynamicEncoding(Encoding encoding, String name) {
         final int encodingIndex = ENCODING_LIST_BY_ENCODING_INDEX.length;
 
         final RubyEncoding rubyEncoding = Encodings.newRubyEncoding(language, encoding, encodingIndex, name);
@@ -252,8 +251,7 @@ public synchronized RubyEncoding createDummyEncoding(String name) {
             return null;
         }
 
-        final byte[] nameBytes = StringOperations.encodeAsciiBytes(name);
-        return defineDynamicEncoding(Encodings.DUMMY_ENCODING_BASE, nameBytes);
+        return defineDynamicEncoding(Encodings.DUMMY_ENCODING_BASE, name);
     }
 
     public RubyEncoding getLocaleEncoding() {

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

@@ -132,8 +132,13 @@ private static Encoding createDummyEncoding() {
     }
 
     @TruffleBoundary
-    public static RubyEncoding newRubyEncoding(RubyLanguage language, Encoding encoding, int index, byte[] name) {
-        var tstring = TStringUtils.fromByteArray(name, Encodings.US_ASCII);
+    public static RubyEncoding newRubyEncoding(RubyLanguage language, Encoding encoding, int index, String name) {
+        if (!StringOperations.isAsciiOnly(name)) {
+            throw CompilerDirectives
+                    .shouldNotReachHere("Encoding name contained non ascii characters \"" + name + "\"");
+        }
+
+        var tstring = TStringUtils.fromJavaString(name, Encodings.US_ASCII);
         final ImmutableRubyString string = language.getImmutableString(tstring, Encodings.US_ASCII);
 
         return new RubyEncoding(encoding, string, index);

src/main/java/org/truffleruby/core/format/format/FormatFloatHumanReadableNode.java

@@ -15,7 +15,6 @@
 import com.oracle.truffle.api.strings.TruffleString;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.TStringUtils;
-import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.string.TStringConstants;
 
 // GENERATED BY tool/generate-core-symbols.rb
@@ -213,8 +212,7 @@ public final class CoreSymbols {
     public RubySymbol createRubySymbol(String string, long id) {
         TruffleString tstring = TStringConstants.lookupUSASCIITString(string);
         if (tstring == null) {
-            byte[] bytes = StringOperations.encodeAsciiBytes(string);
-            tstring = TStringUtils.fromByteArray(bytes, TruffleString.Encoding.US_ASCII);
+            tstring = TStringUtils.fromJavaString(string, TruffleString.Encoding.US_ASCII);
         }
 
         final RubySymbol symbol = new RubySymbol(string, tstring, Encodings.US_ASCII, id);

src/main/java/org/truffleruby/core/format/format/FormatStringNode.java

@@ -34,7 +34,6 @@
 import com.oracle.truffle.api.strings.TruffleString;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.encoding.TStringUtils;
-import org.truffleruby.core.string.StringOperations;
 import org.truffleruby.core.string.TStringConstants;
 
 // GENERATED BY #{__FILE__}
@@ -179,8 +178,7 @@
     public RubySymbol createRubySymbol(String string, long id) {
         TruffleString tstring = TStringConstants.lookupUSASCIITString(string);
         if (tstring == null) {
-            byte[] bytes = StringOperations.encodeAsciiBytes(string);
-            tstring = TStringUtils.fromByteArray(bytes, TruffleString.Encoding.US_ASCII);
+            tstring = TStringUtils.fromJavaString(string, TruffleString.Encoding.US_ASCII);
         }
 
         final RubySymbol symbol = new RubySymbol(string, tstring, Encodings.US_ASCII, id);