Skip to content

[GR-78805] Fix: ensure SubstringNode receives PE constant lazy argument from TextIOWrapper. #1086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graalvmbot merged 1 commit into from
Aug 17, 2026
+11 −3
Merged

[GR-78805] Fix: ensure SubstringNode receives PE constant lazy argument from TextIOWrapper. #1086

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions ...e.graal.python/src/com/oracle/graal/python/builtins/modules/io/TextIOWrapperBuiltins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,8 +494,12 @@ static TruffleString readAll(VirtualFrame frame, PTextIO self, @SuppressWarnings
/* Read everything */
Object bytes = callMethod.execute(frame, inliningTarget, self.getBuffer(), T_READ);
TruffleString decoded = decodeNode.execute(frame, self.getDecoder(), bytes, true);
TruffleString result = self.consumeAllDecodedChars(substringNode, !decoded.isEmpty());
result = concatNode.execute(result, decoded, TS_ENCODING, false);
TruffleString result;
if (decoded.isEmpty()) {
result = self.consumeAllDecodedChars(substringNode, false);
} else {
result = concatNode.execute(self.consumeAllDecodedChars(substringNode, true), decoded, TS_ENCODING, false);
}
self.clearDecodedChars();
self.clearSnapshot();
return result;
Expand Down Expand Up @@ -528,7 +532,11 @@ static TruffleString read(VirtualFrame frame, PTextIO self, int n,
appendStringNode.execute(chunks, result);
}

result = self.consumeDecodedChars(remaining, substringNode, chunks != null);
if (chunks != null) {
result = self.consumeDecodedChars(remaining, substringNode, true);
} else {
result = self.consumeDecodedChars(remaining, substringNode, false);
}
remaining -= codePointLengthNode.execute(result, TS_ENCODING);
}
if (chunks != null) {
Expand Down
Loading