Skip to content

Commit a5ab456

Browse files
committed
[GR-40549] Return EMPTY_US_ASCII for TStringConstants.lookupUSASCIITString("")
PullRequest: truffleruby/3485
2 parents 05b62f3 + 7cb1ae5 commit a5ab456

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ private static TruffleString ascii(String string) {
220220
}
221221

222222
public static TruffleString lookupUSASCIITString(String string) {
223-
if (string.length() == 1) {
223+
if (string.isEmpty()) {
224+
return EMPTY_US_ASCII;
225+
} else if (string.length() == 1) {
224226
return US_ASCII_SINGLE_BYTE[string.charAt(0)];
225227
} else {
226228
return TSTRING_CONSTANTS.get(string);

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,7 @@ public abstract static class ASTNode extends CoreMethodArrayArgumentsNode {
273273
protected Object ast(Object executable,
274274
@Cached ToCallTargetNode toCallTargetNode) {
275275
final RootCallTarget callTarget = toCallTargetNode.execute(executable);
276-
ast(callTarget.getRootNode());
277-
return nil;
276+
return ast(callTarget.getRootNode());
278277
}
279278

280279
private Object ast(Node node) {

0 commit comments

Comments
 (0)