Skip to content
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

8321514: UTF16 string gets constructed incorrectly from codepoints if CompactStrings is not enabled #17057

Closed
wants to merge 4 commits into from
+27 −2
Closed

8321514: UTF16 string gets constructed incorrectly from codepoints if CompactStrings is not enabled #17057

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62b5310
JDK-8321514 implementation
voitylov Dec 11, 2023
50c0984
whitespace
voitylov Dec 11, 2023
759068e
review comments
voitylov Dec 12, 2023
cf622fa
review comments
voitylov Dec 13, 2023
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
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/lang/StringUTF16.java
View file
Original file line number Diff line number Diff line change
@@ -420,7 +420,7 @@ public static byte[] toBytes(int[] val, int index, int len) {
int n = computeCodePointSize(val, index, end);

byte[] buf = newBytesFor(n);
return extractCodepoints(val, index, len, buf, 0);
return extractCodepoints(val, index, end, buf, 0);
}

public static byte[] toBytes(char c) {
27 changes: 26 additions & 1 deletion test/jdk/java/lang/String/Chars.java
View file
Original file line number Diff line number Diff line change
@@ -23,8 +23,10 @@

/*
* @test
* @bug 8054307 8311906
* @bug 8054307 8311906 8321514
* @summary test String chars() and codePoints()
* @run main/othervm -XX:+CompactStrings Chars
* @run main/othervm -XX:-CompactStrings Chars
*/

import java.util.Arrays;
@@ -45,6 +47,7 @@ public static void main(String[] args) {
}
testChars(cc, ccExp);
testCharsSubrange(cc, ccExp);
testIntsSubrange(ccExp);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add the same call after line 74 to apply the test to the surrogates case.
(As suggested by @rgiulietti in #17066)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just pulled the update from that branch.

testCPs(cc, cpExp);

// bmp without surrogates
@@ -72,6 +75,7 @@ public static void main(String[] args) {
cpExp = Arrays.copyOf(cpExp, k);
testChars(cc, ccExp);
testCharsSubrange(cc, ccExp);
testIntsSubrange(ccExp);
testCPs(cc, cpExp);
}
}
@@ -104,6 +108,27 @@ static void testCharsSubrange(char[] cc, int[] expected) {
}
}

static void testIntsSubrange(int[] expected) {
int[] offsets = { 7, 31 }; // offsets to test
int LENGTH = 13;
for (int i = 0; i < offsets.length; i++) {
int offset = Math.max(0, offsets[i]); // confine to the input array
int count = Math.min(LENGTH, expected.length - offset);
String str = new String(expected, offset, count);
int[] actual = str.chars().toArray();
int errOffset = Arrays.mismatch(actual, 0, actual.length,
expected, offset, offset + count);
if (errOffset >= 0) {
System.err.printf("expected[%d] (%d) != actual[%d] (%d)%n",
offset + errOffset, expected[offset + errOffset],
errOffset, actual[errOffset]);
System.err.println("expected: " + Arrays.toString(expected));
System.err.println("actual: " + Arrays.toString(actual));
throw new RuntimeException("testIntsSubrange failed!");
}
}
}

static void testCPs(char[] cc, int[] expected) {
String str = new String(cc);
if (!Arrays.equals(expected, str.codePoints().toArray())) {