Address TruffleString deprecations and serial warnings

eregon · eregon · commit ea05b4672c92 · 2025-07-21T13:37:27.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/csv/CSVReaderBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/csv/CSVReaderBuiltins.java
@@ -168,7 +168,7 @@ static Object nextPos(VirtualFrame frame, CSVReader self,
                 self.lineNum++;
                 TruffleStringIterator tsi = createCodePointIteratorNode.execute(line, TS_ENCODING);
                 while (tsi.hasNext()) {
-                    final int codepoint = stringNextNode.execute(tsi);
+                    final int codepoint = stringNextNode.execute(tsi, TS_ENCODING);
                     parseProcessCodePoint(inliningTarget, self, fields, codepoint, appendCodePointNode, toStringNode, pyNumberFloatNode, appendNode, raiseNode);
                 }
                 parseProcessCodePoint(inliningTarget, self, fields, EOL, appendCodePointNode, toStringNode, pyNumberFloatNode, appendNode, raiseNode);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/csv/CSVWriterBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/csv/CSVWriterBuiltins.java
@@ -239,7 +239,7 @@ static boolean joinAppendData(Node inliningTarget, TruffleStringBuilder sb, CSVD
 
                     boolean wantEscape = false;
 
-                    final int c = nextNode.execute(tsi);
+                    final int c = nextNode.execute(tsi, TS_ENCODING);
 
                     if (needsEscape(dialect, c, byteIndexOfCodePointNode)) {
                         if (dialect.quoting == QUOTE_NONE) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IONodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/IONodes.java
@@ -252,7 +252,7 @@ private IOMode(TruffleString mode, boolean reading, boolean writing, boolean bin
             int flags = 0;
             TruffleStringIterator it = createCodePointIteratorNode.execute(mode, TS_ENCODING);
             while (it.hasNext()) {
-                int c = nextNode.execute(it);
+                int c = nextNode.execute(it, TS_ENCODING);
                 int current;
                 switch (c) {
                     case 'x':
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -68,7 +68,7 @@ static void appendStringUncached(TruffleString ts, TruffleStringBuilderUTF32 bui
         builder.appendCodePointUncached('"');
         TruffleStringIterator it = ts.createCodePointIteratorUncached(TS_ENCODING);
         while (it.hasNext()) {
-            int c = it.nextUncached();
+            int c = it.nextUncached(TS_ENCODING);
             switch (c) {
                 case '\\':
                     builder.appendStringUncached(T_ESC_BACKSLASH);
@@ -122,7 +122,7 @@ static void appendString(TruffleString s, TruffleStringIterator it, TruffleStrin
         int chunkStart = 0;
         int currentIndex = 0;
         while (it.hasNext()) {
-            int c = nextNode.execute(it);
+            int c = nextNode.execute(it, TS_ENCODING);
             switch (c) {
                 case '\\':
                     appendSubstring(builder, s, chunkStart, currentIndex, appendStringNode, substringNode);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java
@@ -1342,7 +1342,7 @@ static Object fromunicode(VirtualFrame frame, PArray self, TruffleString str,
                 TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);
                 int codePointIndex = 0;
                 while (it.hasNext()) {
-                    TruffleString value = fromCodePointNode.execute(nextNode.execute(it), TS_ENCODING, true);
+                    TruffleString value = fromCodePointNode.execute(nextNode.execute(it, TS_ENCODING), TS_ENCODING, true);
                     putValueNode.execute(frame, inliningTarget, self, self.getLength() + codePointIndex++, value);
                 }
                 setLengthNode.execute(inliningTarget, self, newLength);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesNodes.java
@@ -932,7 +932,7 @@ static byte[] nonAscii(TruffleString str,
             TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);
             int i = 0;
             while (it.hasNext()) {
-                if (nextNode.execute(it) > 127) {
+                if (nextNode.execute(it, TS_ENCODING) > 127) {
                     throw raiseNode.raise(inliningTarget, PythonBuiltinClassType.ValueError, NON_HEX_NUMBER_IN_FROMHEX, i);
                 }
                 ++i;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingCollectionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingCollectionNodes.java
@@ -238,7 +238,7 @@ static HashingStorage doString(Node inliningTarget, Object strObj, Object value,
             TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);
             while (it.hasNext()) {
                 // TODO: GR-37219: use SubstringNode with lazy=true?
-                int codePoint = nextNode.execute(it);
+                int codePoint = nextNode.execute(it, TS_ENCODING);
                 TruffleString key = fromCodePointNode.execute(codePoint, TS_ENCODING, true);
                 storage = setStorageItem.execute(inliningTarget, storage, key, val);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorNodes.java
@@ -348,7 +348,7 @@ public static Object[] doIt(Object iterableObj,
             int i = 0;
             while (loopProfile.inject(inliningTarget, it.hasNext())) {
                 // TODO: GR-37219: use SubstringNode with lazy=true?
-                result[i++] = fromCodePointNode.execute(nextNode.execute(it), TS_ENCODING, true);
+                result[i++] = fromCodePointNode.execute(nextNode.execute(it, TS_ENCODING), TS_ENCODING, true);
             }
             return result;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/ListBuiltins.java
@@ -254,7 +254,7 @@ static PNone initTruffleString(PList list, TruffleString value,
             TruffleStringIterator iterator = createCodePointIteratorNode.execute(value, TS_ENCODING);
             while (iterator.hasNext()) {
                 // TODO: GR-37219: use SubstringNode with lazy=true?
-                int cp = nextNode.execute(iterator);
+                int cp = nextNode.execute(iterator, TS_ENCODING);
                 appendNode.execute(list, fromCodePointNode.execute(cp, TS_ENCODING, true));
             }
             return PNone.NONE;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java
@@ -1016,15 +1016,15 @@ static PDict doString(VirtualFrame frame, Object cls, Object from, Object to, Ob
             TruffleStringIterator toIt = createCodePointIteratorNode.execute(toStr, TS_ENCODING);
             while (fromIt.hasNext()) {
                 assert toIt.hasNext();
-                int key = nextNode.execute(fromIt);
-                int value = nextNode.execute(toIt);
+                int key = nextNode.execute(fromIt, TS_ENCODING);
+                int value = nextNode.execute(toIt, TS_ENCODING);
                 storage = setHashingStorageItem.execute(frame, inliningTarget, storage, key, value);
             }
             assert !toIt.hasNext();
             if (hasZ) {
                 TruffleStringIterator zIt = createCodePointIteratorNode.execute(zString, TS_ENCODING);
                 while (zIt.hasNext()) {
-                    int key = nextNode.execute(zIt);
+                    int key = nextNode.execute(zIt, TS_ENCODING);
                     storage = setHashingStorageItem.execute(frame, inliningTarget, storage, key, PNone.NONE);
                 }
             }
@@ -1089,7 +1089,7 @@ static TruffleString doStringString(TruffleString self, TruffleString table,
             TruffleStringIterator it = createCodePointIteratorNode.execute(self, TS_ENCODING);
             TruffleStringBuilder sb = TruffleStringBuilder.create(TS_ENCODING, self.byteLength(TS_ENCODING));
             while (it.hasNext()) {
-                int cp = nextNode.execute(it);
+                int cp = nextNode.execute(it, TS_ENCODING);
                 if (cp >= 0 && cp < tableLen) {
                     cp = codePointAtIndexNode.execute(table, cp, TS_ENCODING);
                 }
@@ -1114,7 +1114,7 @@ static TruffleString doGeneric(VirtualFrame frame, Object self, Object table,
             TruffleStringBuilder sb = TruffleStringBuilder.create(TS_ENCODING, selfStr.byteLength(TS_ENCODING));
             TruffleStringIterator it = createCodePointIteratorNode.execute(selfStr, TS_ENCODING);
             while (it.hasNext()) {
-                int original = nextNode.execute(it);
+                int original = nextNode.execute(it, TS_ENCODING);
                 Object translated = null;
                 try {
                     translated = getItemNode.execute(frame, inliningTarget, table, original);
@@ -1920,7 +1920,7 @@ boolean doGeneric(Object selfObj,
             }
             TruffleStringIterator it = createCodePointIteratorNode.execute(self, TS_ENCODING);
             while (it.hasNext()) {
-                int codePoint = nextNode.execute(it);
+                int codePoint = nextNode.execute(it, TS_ENCODING);
                 if (!isCategory(codePoint)) {
                     return false;
                 }
@@ -2056,7 +2056,7 @@ static boolean doIt(Object selfObj,
             boolean hasLower = false;
             TruffleStringIterator it = createCodePointIteratorNode.execute(self, TS_ENCODING);
             while (it.hasNext()) {
-                int codePoint = nextNode.execute(it);
+                int codePoint = nextNode.execute(it, TS_ENCODING);
                 if (isUpper(codePoint)) {
                     return false;
                 }
@@ -2113,7 +2113,7 @@ static boolean doString(TruffleString self,
             boolean previousIsCased = false;
             TruffleStringIterator it = createCodePointIteratorNode.execute(self, TS_ENCODING);
             while (it.hasNext()) {
-                int codePoint = nextNode.execute(it);
+                int codePoint = nextNode.execute(it, TS_ENCODING);
                 if (isUpper(codePoint)) {
                     if (previousIsCased) {
                         return false;
@@ -2163,7 +2163,7 @@ static boolean doString(TruffleString self,
             boolean hasUpper = false;
             TruffleStringIterator it = createCodePointIteratorNode.execute(self, TS_ENCODING);
             while (it.hasNext()) {
-                int codePoint = nextNode.execute(it);
+                int codePoint = nextNode.execute(it, TS_ENCODING);
                 if (isLower(codePoint)) {
                     return false;
                 }
@@ -2262,7 +2262,7 @@ static TruffleString doString(TruffleString self,
             int start = 0;
             int end = 0;
             while (it.hasNext()) {
-                final int cp = nextNode.execute(it);
+                final int cp = nextNode.execute(it, TS_ENCODING);
                 if (!UCharacter.isLowerCase(cp) && !UCharacter.isUpperCase(cp)) {
                     if (start == end) {
                         appendCodePointNode.execute(sb, cp, 1, true);
@@ -2621,7 +2621,7 @@ static TruffleString doString(TruffleString self, int tabsize,
             TruffleStringIterator it = createCodePointIteratorNode.execute(self, TS_ENCODING);
             // It's ok to iterate with charAt, we just pass surrogates through
             while (it.hasNext()) {
-                int cp = nextNode.execute(it);
+                int cp = nextNode.execute(it, TS_ENCODING);
                 if (cp == '\t') {
                     int incr = tabsize - (linePos % tabsize);
                     if (incr > 0) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringNodes.java
@@ -288,10 +288,10 @@ static TruffleString doString(TruffleString self, TruffleString arg,
             TruffleStringBuilder sb = TruffleStringBuilder.create(TS_ENCODING);
             TruffleStringIterator it = createCodePointIteratorNode.execute(arg, TS_ENCODING);
             assert it.hasNext();
-            appendCodePointNode.execute(sb, nextNode.execute(it), 1, true);
+            appendCodePointNode.execute(sb, nextNode.execute(it, TS_ENCODING), 1, true);
             while (it.hasNext()) {
                 appendStringNode.execute(sb, self);
-                appendCodePointNode.execute(sb, nextNode.execute(it), 1, true);
+                appendCodePointNode.execute(sb, nextNode.execute(it, TS_ENCODING), 1, true);
             }
             return toStringNode.execute(sb);
         }
@@ -565,7 +565,7 @@ static TruffleString doReplace(TruffleString self, TruffleString old, TruffleStr
                         return toStringNode.execute(sb);
                     }
                     appendStringNode.execute(sb, with);
-                    int codePoint = nextNode.execute(it);
+                    int codePoint = nextNode.execute(it, TS_ENCODING);
                     appendCodePointNode.execute(sb, codePoint, 1, true);
                     ++i;
                 }
@@ -628,7 +628,7 @@ static TruffleString doString(TruffleString self,
             byte[] buffer = new byte[12];
             appendCodePointNode.execute(sb, useDoubleQuotes ? '"' : '\'', 1, true);
             while (it.hasNext()) {
-                int codepoint = nextNode.execute(it);
+                int codepoint = nextNode.execute(it, TS_ENCODING);
                 switch (codepoint) {
                     case '"':
                         if (useDoubleQuotes) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringUtils.java
@@ -319,12 +319,12 @@ static boolean doString(TruffleString str,
                 return false;
             }
             TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);
-            int c = nextNode.execute(it);
+            int c = nextNode.execute(it, TS_ENCODING);
             if (c != '_' && !isIdentifierStart(c)) {
                 return false;
             }
             while (it.hasNext()) {
-                c = nextNode.execute(it);
+                c = nextNode.execute(it, TS_ENCODING);
                 if (!isIdentifierPart(c)) {
                     return false;
                 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tokenize/TokenizerIterBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tokenize/TokenizerIterBuiltins.java
@@ -204,7 +204,7 @@ private static int[] getCodePoints(TruffleString ts) {
             int i = 0;
             TruffleStringIterator it = ts.createCodePointIteratorUncached(TS_ENCODING);
             while (it.hasNext()) {
-                res[i++] = it.nextUncached();
+                res[i++] = it.nextUncached(TS_ENCODING);
             }
             return res;
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/IteratorExhausted.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/IteratorExhausted.java
@@ -42,6 +42,7 @@
 
 import com.oracle.graal.python.runtime.exception.PythonControlFlowException;
 
+@SuppressWarnings("serial")
 public class IteratorExhausted extends PythonControlFlowException {
     public static final IteratorExhausted INSTANCE = new IteratorExhausted();
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectAsciiNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectAsciiNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -92,7 +92,7 @@ public static TruffleString ascii(VirtualFrame frame, Node inliningTarget, Objec
         TruffleStringIterator it = createCodePointIteratorNode.execute(repr, TS_ENCODING);
         int j = 0;
         while (it.hasNext()) {
-            int ch = nextNode.execute(it);
+            int ch = nextNode.execute(it, TS_ENCODING);
             j = unicodeNonAsciiEscape(ch, j, bytes);
         }
         return switchEncodingNode.execute(fromByteArrayNode.execute(bytes, 0, j, Encoding.US_ASCII, true), TS_ENCODING);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/attributes/LookupAttributeInMRONode.java
@@ -225,6 +225,7 @@ protected Object lookupPBCTGeneric(PythonBuiltinClassType klass,
     record AttributeAssumptionPair(Assumption assumption, Object value, boolean invalidate) {
     }
 
+    @SuppressWarnings("serial")
     static final class InvalidateLookupException extends ControlFlowException {
         private static final InvalidateLookupException INSTANCE = new InvalidateLookupException();
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/SpecialMethodNotFound.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/SpecialMethodNotFound.java
@@ -45,6 +45,7 @@
 /**
  * Thrown from {@code LookupAndCallNAry} nodes when the method does not exist.
  */
+@SuppressWarnings("serial")
 public final class SpecialMethodNotFound extends ControlFlowException {
     public static final SpecialMethodNotFound INSTANCE = new SpecialMethodNotFound();
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PythonInterruptedException.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PythonInterruptedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -50,6 +50,7 @@
  * If {@link PythonThreadKillException} bubbles up to the top handler in the main thread, we
  * translate it to this exception.
  */
+@SuppressWarnings("serial")
 @ExportLibrary(InteropLibrary.class)
 public class PythonInterruptedException extends AbstractTruffleException {
     @ExportMessage
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/CharsetMapping.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/CharsetMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -163,7 +163,7 @@ static TruffleString normalize(TruffleString encoding,
             boolean lastCharInvalid = false;
             TruffleStringIterator it = createCodePointIteratorNode.execute(encoding, TS_ENCODING);
             while (it.hasNext()) {
-                int c = nextNode.execute(it);
+                int c = nextNode.execute(it, TS_ENCODING);
                 if ((c >= 'A' && c <= 'Z')) {
                     appendCodePointNode.execute(str, c - 'A' + 'a', 1, true);
                     lastCharInvalid = false;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java
@@ -246,7 +246,7 @@ public static CodePoints truffleStringToCodePoints(TruffleString ts) {
         TruffleStringIterator it = ts.createCodePointIteratorUncached(TS_ENCODING);
         int i = 0;
         while (it.hasNext()) {
-            buf[i++] = it.nextUncached();
+            buf[i++] = it.nextUncached(TS_ENCODING);
         }
         return CodePoints.fromBuffer(buf, 0, i);
     }

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ static Object nextPos(VirtualFrame frame, CSVReader self,`
`168`	`168`	`self.lineNum++;`
`169`	`169`	`TruffleStringIterator tsi = createCodePointIteratorNode.execute(line, TS_ENCODING);`
`170`	`170`	`while (tsi.hasNext()) {`
`171`		`- final int codepoint = stringNextNode.execute(tsi);`
	`171`	`+ final int codepoint = stringNextNode.execute(tsi, TS_ENCODING);`
`172`	`172`	`parseProcessCodePoint(inliningTarget, self, fields, codepoint, appendCodePointNode, toStringNode, pyNumberFloatNode, appendNode, raiseNode);`
`173`	`173`	`}`
`174`	`174`	`parseProcessCodePoint(inliningTarget, self, fields, EOL, appendCodePointNode, toStringNode, pyNumberFloatNode, appendNode, raiseNode);`
Original file line number	Diff line number	Diff line change
`@@ -1342,7 +1342,7 @@ static Object fromunicode(VirtualFrame frame, PArray self, TruffleString str,`
`1342`	`1342`	`TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);`
`1343`	`1343`	`int codePointIndex = 0;`
`1344`	`1344`	`while (it.hasNext()) {`
`1345`		`- TruffleString value = fromCodePointNode.execute(nextNode.execute(it), TS_ENCODING, true);`
	`1345`	`+ TruffleString value = fromCodePointNode.execute(nextNode.execute(it, TS_ENCODING), TS_ENCODING, true);`
`1346`	`1346`	`putValueNode.execute(frame, inliningTarget, self, self.getLength() + codePointIndex++, value);`
`1347`	`1347`	`}`
`1348`	`1348`	`setLengthNode.execute(inliningTarget, self, newLength);`
Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@ static byte[] nonAscii(TruffleString str,`
`932`	`932`	`TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);`
`933`	`933`	`int i = 0;`
`934`	`934`	`while (it.hasNext()) {`
`935`		`- if (nextNode.execute(it) > 127) {`
	`935`	`+ if (nextNode.execute(it, TS_ENCODING) > 127) {`
`936`	`936`	`throw raiseNode.raise(inliningTarget, PythonBuiltinClassType.ValueError, NON_HEX_NUMBER_IN_FROMHEX, i);`
`937`	`937`	`}`
`938`	`938`	`++i;`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ static HashingStorage doString(Node inliningTarget, Object strObj, Object value,`
`238`	`238`	`TruffleStringIterator it = createCodePointIteratorNode.execute(str, TS_ENCODING);`
`239`	`239`	`while (it.hasNext()) {`
`240`	`240`	`// TODO: GR-37219: use SubstringNode with lazy=true?`
`241`		`- int codePoint = nextNode.execute(it);`
	`241`	`+ int codePoint = nextNode.execute(it, TS_ENCODING);`
`242`	`242`	`TruffleString key = fromCodePointNode.execute(codePoint, TS_ENCODING, true);`
`243`	`243`	`storage = setStorageItem.execute(inliningTarget, storage, key, val);`
`244`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ public static Object[] doIt(Object iterableObj,`
`348`	`348`	`int i = 0;`
`349`	`349`	`while (loopProfile.inject(inliningTarget, it.hasNext())) {`
`350`	`350`	`// TODO: GR-37219: use SubstringNode with lazy=true?`
`351`		`- result[i++] = fromCodePointNode.execute(nextNode.execute(it), TS_ENCODING, true);`
	`351`	`+ result[i++] = fromCodePointNode.execute(nextNode.execute(it, TS_ENCODING), TS_ENCODING, true);`
`352`	`352`	`}`
`353`	`353`	`return result;`
`354`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ static PNone initTruffleString(PList list, TruffleString value,`
`254`	`254`	`TruffleStringIterator iterator = createCodePointIteratorNode.execute(value, TS_ENCODING);`
`255`	`255`	`while (iterator.hasNext()) {`
`256`	`256`	`// TODO: GR-37219: use SubstringNode with lazy=true?`
`257`		`- int cp = nextNode.execute(iterator);`
	`257`	`+ int cp = nextNode.execute(iterator, TS_ENCODING);`
`258`	`258`	`appendNode.execute(list, fromCodePointNode.execute(cp, TS_ENCODING, true));`
`259`	`259`	`}`
`260`	`260`	`return PNone.NONE;`