[GR-42961] Add missin encoding switch in ToRegexSourceNode.

PullRequest: graalpython/2639

Author: djoooooe

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java

@@ -1058,7 +1058,7 @@ private void writeString(TruffleString v) {
              * passthrough. If the string contains surrogates, we mark it and emit it as UTF-32.
              */
             Encoding encoding;
-            if (v.isCompatibleTo(Encoding.UTF_8)) {
+            if (v.isValidUncached(TS_ENCODING)) {
                 encoding = Encoding.UTF_8;
             } else {
                 encoding = Encoding.UTF_32LE;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SREModuleBuiltins.java

@@ -160,7 +160,8 @@ protected Source doGeneric(VirtualFrame frame, Object pattern, TruffleString fla
                         @Cached CastToTruffleStringNode cast,
                         @CachedLibrary(limit = "3") PythonBufferAcquireLibrary bufferAcquireLib,
                         @CachedLibrary(limit = "1") PythonBufferAccessLibrary bufferLib,
-                        @Cached TruffleString.FromByteArrayNode fromByteArrayNode) {
+                        @Cached TruffleString.FromByteArrayNode fromByteArrayNode,
+                        @Cached TruffleString.SwitchEncodingNode switchEncodingNode) {
             try {
                 return doString(cast.execute(pattern), flags, options, inliningTarget, nonEmptyOptionsProfile, appendStringNode, toStringNode, toJavaStringNode);
             } catch (CannotCastException ce) {
@@ -173,7 +174,7 @@ protected Source doGeneric(VirtualFrame frame, Object pattern, TruffleString fla
                 try {
                     byte[] bytes = bufferLib.getInternalOrCopiedByteArray(buffer);
                     int bytesLen = bufferLib.getBufferLength(buffer);
-                    TruffleString patternStr = fromByteArrayNode.execute(bytes, 0, bytesLen, Encoding.ISO_8859_1, false);
+                    TruffleString patternStr = switchEncodingNode.execute(fromByteArrayNode.execute(bytes, 0, bytesLen, Encoding.ISO_8859_1, false), TS_ENCODING);
                     return constructRegexSource(inliningTarget, T_ENCODING_LATIN_1, options, patternStr, flags, nonEmptyOptionsProfile, appendStringNode, toStringNode, toJavaStringNode);
                 } finally {
                     bufferLib.release(buffer, frame, this);