[GR-43593] [GR-43399] Update to JCodings 1.0.58 and Joni 2.1.44

PullRequest: truffleruby/3695

Author: eregon

CHANGELOG.md

@@ -90,6 +90,7 @@ Compatibility:
 * Update `$LOAD_PATH.resolve_feature_path` to return `nil` instead of raising `LoadError` when feature isn't found (#2733, @andrykonchin).
 * Add `objspace/trace` file (#2733, @andrykonchin).
 * Add `Process._fork` (#2733, @horakivo).
+* Update to JCodings 1.0.58 and Joni 2.1.44 (@eregon).
 
 Performance:
 

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "de9796c50f3de5a166287285174646fd34cbce5e",
+                "version": "ccbe0c944d918159f36bac32e37c1a8cc529604f",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "de9796c50f3de5a166287285174646fd34cbce5e",
+                "version": "ccbe0c944d918159f36bac32e37c1a8cc529604f",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -56,25 +56,25 @@
 
         # ------------- Libraries -------------
 
-        "JONI": {
+        "JCODINGS": {
             "maven": {
-                "groupId": "org.jruby.joni",
-                "artifactId": "joni",
-                "version": "2.1.41"
+                "groupId": "org.jruby.jcodings",
+                "artifactId": "jcodings",
+                "version": "1.0.58"
             },
-            "digest": "sha512:88728bb3b6cf8b385e3a4639981ab8a54e977291cbb1d8b60fddd3a3381d9d5f356faa46b6b15b9ccf6ed4a2a42552152a254bfeab60f8b2ddac4959300212ac",
-            "sourceDigest": "sha512:8502efcc9ab4d31aa92eb9c279f02b9cb1ab2d9c65660635a84d9ef6e773b05ebae026043ed7749a41dc0ee8b5f822d2e88ba44b3f6e244b145d61f2095e8d77",
+            "digest": "sha512:625210aa07d1e08bf2f5fdc9da6c491a4e5a56e7db297cba1aa73636670ac1d62f3fd763716ef6ede862456b17169272ed9c8461d07100f95262163dc9c18ef8",
+            "sourceDigest": "sha512:d0f883f658310f7ad091aea08df28f1f5fe12080d6cb266cd91aec7e34cda1d57736d32618e8632b329854367d6e4d5fc91b5eb8ac9b823b26113fae3f75f50c",
             "license": ["MIT"],
         },
 
-        "JCODINGS": {
+        "JONI": {
             "maven": {
-                "groupId": "org.jruby.jcodings",
-                "artifactId": "jcodings",
-                "version": "1.0.55"
+                "groupId": "org.jruby.joni",
+                "artifactId": "joni",
+                "version": "2.1.44"
             },
-            "digest": "sha512:791c1442ca0aad9132f5d2d641f9bacf5b461e11fa2f8d2010af0de77ee2629a330c739004699bb987e331798e1eea06b5b6b15b7e7dd6d41f3322edce805d6b",
-            "sourceDigest": "sha512:8935def3d670972d1d82a981fe3fbd999abffac07350c46419f1e542c4529f00c949e3eef442321fce23941b648cb09de157114ec751c0ef85c7ccfa6b719445",
+            "digest": "sha512:59b901333d93b8eaf0c28a2d269d159e6806701902505113148c4df6b2ade973e97f9b888b8b5b4dff4d3c667b4594eeee8133f4260e7f1f3d9af1a031b9cab4",
+            "sourceDigest": "sha512:773051c47893799ecc0b916b80c4dedac0efe2988743d455ce8529460aed2d7664d4b12cd51e449a8b20ac0c37e32ead89d72f6acf4f6a780268b55fdd67e3cf",
             "license": ["MIT"],
         },
 

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

@@ -12,7 +12,9 @@
  */
 package org.truffleruby.core.encoding;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.strings.TruffleString;
 import org.jcodings.Encoding;
 import org.jcodings.EncodingDB;
 import org.jcodings.specific.ASCIIEncoding;
@@ -72,8 +74,11 @@ private static RubyEncoding[] initializeRubyEncodings() {
             if (encoding == USASCIIEncoding.INSTANCE) {
                 rubyEncoding = US_ASCII;
             } else {
-                final ImmutableRubyString name = FrozenStringLiterals.createStringAndCacheLater(
-                        TStringConstants.TSTRING_CONSTANTS.get(encoding.toString()), US_ASCII);
+                TruffleString tstring = TStringConstants.TSTRING_CONSTANTS.get(encoding.toString());
+                if (tstring == null) {
+                    throw CompilerDirectives.shouldNotReachHere("no TStringConstants for " + encoding);
+                }
+                final ImmutableRubyString name = FrozenStringLiterals.createStringAndCacheLater(tstring, US_ASCII);
                 rubyEncoding = new RubyEncoding(encoding, name, encoding.getIndex());
             }
             encodings[encoding.getIndex()] = rubyEncoding;

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

@@ -35,6 +35,8 @@
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.library.RubyStringLibrary;
 
+import java.util.Objects;
+
 /** All ImmutableRubyString are interned and must be created through
  * {@link FrozenStringLiterals#getFrozenStringLiteral}. */
 @ExportLibrary(InteropLibrary.class)
@@ -47,8 +49,8 @@ public final class ImmutableRubyString extends ImmutableRubyObjectCopyable imple
     ImmutableRubyString(TruffleString tstring, RubyEncoding encoding) {
         assert tstring.isCompatibleToUncached(encoding.tencoding);
         assert tstring.isManaged();
-        this.tstring = tstring;
-        this.encoding = encoding;
+        this.tstring = Objects.requireNonNull(tstring);
+        this.encoding = Objects.requireNonNull(encoding);
     }
 
     /** should only be used for debugging */

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

@@ -34,6 +34,8 @@
 import com.oracle.truffle.api.object.Shape;
 import org.truffleruby.language.library.RubyStringLibrary;
 
+import java.util.Objects;
+
 @ExportLibrary(RubyLibrary.class)
 @ExportLibrary(InteropLibrary.class)
 @ImportStatic(RubyBaseNode.class)
@@ -53,19 +55,19 @@ public RubyString(
         super(rubyClass, shape);
         assert tstring.isCompatibleToUncached(rubyEncoding.tencoding);
         this.frozen = frozen;
-        this.tstring = tstring;
-        this.encoding = rubyEncoding;
+        this.tstring = Objects.requireNonNull(tstring);
+        this.encoding = Objects.requireNonNull(rubyEncoding);
     }
 
     public void setTString(AbstractTruffleString tstring) {
         assert tstring.isCompatibleToUncached(getEncodingUncached().tencoding);
-        this.tstring = tstring;
+        this.tstring = Objects.requireNonNull(tstring);
     }
 
     public void setTString(AbstractTruffleString tstring, RubyEncoding encoding) {
         assert tstring.isCompatibleToUncached(encoding.tencoding);
-        this.tstring = tstring;
-        this.encoding = encoding;
+        this.tstring = Objects.requireNonNull(tstring);
+        this.encoding = Objects.requireNonNull(encoding);
     }
 
     public void clearCodeRange() {

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

@@ -203,6 +203,8 @@ public class TStringConstants {
     public static final TruffleString STATELESS_ISO_2022_JP_KDDI = ascii("stateless-ISO-2022-JP-KDDI");
     public static final TruffleString UTF8_SOFTBANK = ascii("UTF8-SoftBank");
     public static final TruffleString SJIS_SOFTBANK = ascii("SJIS-SoftBank");
+    public static final TruffleString IBM720 = ascii("IBM720");
+    public static final TruffleString CESU_8 = ascii("CESU-8");
 
     private static TruffleString ascii(String string) {
         if (string.length() == 1) {

src/main/java/org/truffleruby/core/symbol/RubySymbol.java

@@ -31,6 +31,8 @@
 import org.truffleruby.parser.IdentifierType;
 import org.truffleruby.parser.Identifiers;
 
+import java.util.Objects;
+
 @ExportLibrary(InteropLibrary.class)
 public final class RubySymbol extends ImmutableRubyObjectNotCopyable implements TruffleObject {
 
@@ -51,9 +53,9 @@ public final class RubySymbol extends ImmutableRubyObjectNotCopyable implements
     RubySymbol(String string, TruffleString tstring, RubyEncoding encoding, long id) {
         assert tstring.isManaged();
         assert tstring.isCompatibleToUncached(encoding.tencoding);
-        this.encoding = encoding;
-        this.string = string;
-        this.tstring = tstring;
+        this.encoding = Objects.requireNonNull(encoding);
+        this.string = Objects.requireNonNull(string);
+        this.tstring = Objects.requireNonNull(tstring);
         this.javaStringHashCode = string.hashCode();
         this.id = id;
         this.type = Identifiers.stringToType(string);