TruffleStrings: keep overloaded versions of nodes with new ErrorHandling parameter.

Author: djoooooe

truffle/src/com.oracle.truffle.api.strings/snapshot.sigtest

@@ -98,14 +98,11 @@ meth public final int byteIndexOfStringUncached(com.oracle.truffle.api.strings.T
 meth public final int byteIndexToCodePointIndexUncached(int,int,com.oracle.truffle.api.strings.TruffleString$Encoding)
 meth public final int byteLength(com.oracle.truffle.api.strings.TruffleString$Encoding)
 meth public final int byteLengthOfCodePointUncached(int,com.oracle.truffle.api.strings.TruffleString$Encoding)
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.3")
 meth public final int byteLengthOfCodePointUncached(int,com.oracle.truffle.api.strings.TruffleString$Encoding,com.oracle.truffle.api.strings.TruffleString$ErrorHandling)
 meth public final int charIndexOfAnyCharUTF16Uncached(int,int,char[])
 meth public final int codePointAtByteIndexUncached(int,com.oracle.truffle.api.strings.TruffleString$Encoding)
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.3")
 meth public final int codePointAtByteIndexUncached(int,com.oracle.truffle.api.strings.TruffleString$Encoding,com.oracle.truffle.api.strings.TruffleString$ErrorHandling)
 meth public final int codePointAtIndexUncached(int,com.oracle.truffle.api.strings.TruffleString$Encoding)
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.3")
 meth public final int codePointAtIndexUncached(int,com.oracle.truffle.api.strings.TruffleString$Encoding,com.oracle.truffle.api.strings.TruffleString$ErrorHandling)
 meth public final int codePointIndexToByteIndexUncached(int,int,com.oracle.truffle.api.strings.TruffleString$Encoding)
 meth public final int codePointLengthUncached(com.oracle.truffle.api.strings.TruffleString$Encoding)
@@ -370,7 +367,6 @@ CLSS public abstract static com.oracle.truffle.api.strings.TruffleString$ByteLen
  outer com.oracle.truffle.api.strings.TruffleString
 meth public abstract int execute(com.oracle.truffle.api.strings.AbstractTruffleString,int,com.oracle.truffle.api.strings.TruffleString$Encoding,com.oracle.truffle.api.strings.TruffleString$ErrorHandling)
 meth public final int execute(com.oracle.truffle.api.strings.AbstractTruffleString,int,com.oracle.truffle.api.strings.TruffleString$Encoding)
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.3")
 meth public static com.oracle.truffle.api.strings.TruffleString$ByteLengthOfCodePointNode create()
 meth public static com.oracle.truffle.api.strings.TruffleString$ByteLengthOfCodePointNode getUncached()
 supr com.oracle.truffle.api.nodes.Node
@@ -386,7 +382,6 @@ CLSS public abstract static com.oracle.truffle.api.strings.TruffleString$CodePoi
  outer com.oracle.truffle.api.strings.TruffleString
 meth public abstract int execute(com.oracle.truffle.api.strings.AbstractTruffleString,int,com.oracle.truffle.api.strings.TruffleString$Encoding,com.oracle.truffle.api.strings.TruffleString$ErrorHandling)
 meth public final int execute(com.oracle.truffle.api.strings.AbstractTruffleString,int,com.oracle.truffle.api.strings.TruffleString$Encoding)
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.3")
 meth public static com.oracle.truffle.api.strings.TruffleString$CodePointAtByteIndexNode create()
 meth public static com.oracle.truffle.api.strings.TruffleString$CodePointAtByteIndexNode getUncached()
 supr com.oracle.truffle.api.nodes.Node
@@ -395,7 +390,6 @@ CLSS public abstract static com.oracle.truffle.api.strings.TruffleString$CodePoi
  outer com.oracle.truffle.api.strings.TruffleString
 meth public abstract int execute(com.oracle.truffle.api.strings.AbstractTruffleString,int,com.oracle.truffle.api.strings.TruffleString$Encoding,com.oracle.truffle.api.strings.TruffleString$ErrorHandling)
 meth public final int execute(com.oracle.truffle.api.strings.AbstractTruffleString,int,com.oracle.truffle.api.strings.TruffleString$Encoding)
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="22.3")
 meth public static com.oracle.truffle.api.strings.TruffleString$CodePointAtIndexNode create()
 meth public static com.oracle.truffle.api.strings.TruffleString$CodePointAtIndexNode getUncached()
 supr com.oracle.truffle.api.nodes.Node

truffle/src/com.oracle.truffle.api.strings/src/com/oracle/truffle/api/strings/AbstractTruffleString.java

@@ -599,14 +599,8 @@ public final int readCharUTF16Uncached(int i) {
      * Shorthand for calling the uncached version of
      * {@link TruffleString.CodePointIndexToByteIndexNode}.
      *
-     * @deprecated since 22.3, use
-     *             {@link #byteLengthOfCodePointUncached(int, Encoding, TruffleString.ErrorHandling)}
-     *             instead.
-     * 
      * @since 22.1
      */
-    @Deprecated(since = "22.3")
-    @SuppressWarnings("deprecated")
     @TruffleBoundary
     public final int byteLengthOfCodePointUncached(int byteIndex, TruffleString.Encoding expectedEncoding) {
         return TruffleString.ByteLengthOfCodePointNode.getUncached().execute(this, byteIndex, expectedEncoding);
@@ -648,14 +642,8 @@ public final int codePointIndexToByteIndexUncached(int byteOffset, int codepoint
     /**
      * Shorthand for calling the uncached version of {@link TruffleString.CodePointAtIndexNode}.
      *
-     * @deprecated since 22.3, use
-     *             {@link #codePointAtIndexUncached(int, Encoding, TruffleString.ErrorHandling)}
-     *             instead.
-     * 
      * @since 22.1
      */
-    @Deprecated(since = "22.3")
-    @SuppressWarnings("deprecated")
     @TruffleBoundary
     public final int codePointAtIndexUncached(int i, TruffleString.Encoding expectedEncoding) {
         return TruffleString.CodePointAtIndexNode.getUncached().execute(this, i, expectedEncoding);
@@ -674,14 +662,8 @@ public final int codePointAtIndexUncached(int i, TruffleString.Encoding expected
     /**
      * Shorthand for calling the uncached version of {@link TruffleString.CodePointAtByteIndexNode}.
      *
-     * @deprecated since 22.3, use
-     *             {@link #codePointAtByteIndexUncached(int, Encoding, TruffleString.ErrorHandling)}
-     *             instead.
-     * 
      * @since 22.1
      */
-    @Deprecated(since = "22.3")
-    @SuppressWarnings("deprecated")
     @TruffleBoundary
     public final int codePointAtByteIndexUncached(int i, TruffleString.Encoding expectedEncoding) {
         return TruffleString.CodePointAtByteIndexNode.getUncached().execute(this, i, expectedEncoding);

truffle/src/com.oracle.truffle.api.strings/src/com/oracle/truffle/api/strings/SuppressFBWarnings.java

@@ -2950,15 +2950,11 @@ public abstract static class ByteLengthOfCodePointNode extends Node {
         }
 
         /**
-         * Get the number of bytes occupied by the codepoint starting at {@code byteIndex}.
-         *
-         * @deprecated since 22.3, use
-         *             {@link #execute(AbstractTruffleString, int, Encoding, ErrorHandling)}
-         *             instead.
+         * Get the number of bytes occupied by the codepoint starting at {@code byteIndex}, with
+         * {@link ErrorHandling#BEST_EFFORT best-effort} error handling.
          *
          * @since 22.1
          */
-        @Deprecated(since = "22.3")
         public final int execute(AbstractTruffleString a, int byteIndex, Encoding expectedEncoding) {
             return execute(a, byteIndex, expectedEncoding, ErrorHandling.BEST_EFFORT);
         }
@@ -3146,14 +3142,11 @@ public abstract static class CodePointAtIndexNode extends Node {
         }
 
         /**
-         * Decode and return the codepoint at codepoint index {@code i}.
-         *
-         * @deprecated since 22.3, use
-         *             {@link #execute(AbstractTruffleString, int, Encoding, ErrorHandling)}
-         *             instead.
+         * Decode and return the codepoint at codepoint index {@code i}, with
+         * {@link ErrorHandling#BEST_EFFORT best-effort} error handling.
+         * 
          * @since 22.1
          */
-        @Deprecated(since = "22.3")
         public final int execute(AbstractTruffleString a, int i, Encoding expectedEncoding) {
             return execute(a, i, expectedEncoding, ErrorHandling.BEST_EFFORT);
         }
@@ -3230,15 +3223,11 @@ public abstract static class CodePointAtByteIndexNode extends Node {
         }
 
         /**
-         * Decode and return the codepoint at byte index {@code i}.
-         *
-         * @deprecated since 22.3, use
-         *             {@link #execute(AbstractTruffleString, int, Encoding, ErrorHandling)}
-         *             instead.
+         * Decode and return the codepoint at byte index {@code i}, with
+         * {@link ErrorHandling#BEST_EFFORT best-effort} error handling.
          *
          * @since 22.1
          */
-        @Deprecated(since = "22.3")
         public final int execute(AbstractTruffleString a, int i, Encoding expectedEncoding) {
             return execute(a, i, expectedEncoding, ErrorHandling.BEST_EFFORT);
         }
@@ -4882,6 +4871,7 @@ public static EqualNode getUncached() {
      *
      * @since 22.1
      */
+    @SuppressWarnings("serial")
     public static final class NumberFormatException extends Exception {
 
         private static final long serialVersionUID = 0x016db657faff57a2L;
@@ -4945,7 +4935,7 @@ public String getMessage() {
             }
         }
 
-        @SuppressFBWarnings(value = {"SE_BAD_FIELD"}, justification = "This Exception is not expected to be serialized") private final AbstractTruffleString string;
+        private final AbstractTruffleString string;
         private final int regionOffset;
         private final int regionLength;
         private final Reason reason;