archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8247696: Incorrect tail computation for large segments in AbstractMemorySegmentImpl::mismatch

Browse source 
Reviewed-by: psandoz, mcimadamore
This commit is contained in:
Chris Hegarty 2020-06-23 10:09:26 +01:00
parent 6469685285
commit 7f69acc778
4 changed files with 99 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/java.base/share/classes/jdk/internal/util/ArraysSupport.java
View file

@ -163,19 +163,24 @@ public class ArraysSupport {
/**
* Mismatch over long lengths.
*/
public static long vectorizedMismatchLarge(Object a, long aOffset,
Object b, long bOffset,
long length,
int log2ArrayIndexScale) {
public static long vectorizedMismatchLargeForBytes(Object a, long aOffset,
Object b, long bOffset,
long length) {
long off = 0;
long remaining = length;
int i ;
while (remaining > 7) {
int size = (int) Math.min(Integer.MAX_VALUE, remaining);
int i, size;
boolean lastSubRange = false;
while (remaining > 7 && !lastSubRange) {
if (remaining > Integer.MAX_VALUE) {
size = Integer.MAX_VALUE;
} else {
size = (int) remaining;
lastSubRange = true;
}
i = vectorizedMismatch(
a, aOffset + off,
b, bOffset + off,
size, log2ArrayIndexScale);
size, LOG2_ARRAY_BYTE_INDEX_SCALE);
if (i >= 0)
return off + i;
@ -183,7 +188,7 @@ public class ArraysSupport {
off += i;
remaining -= i;
}
return ~off;
return ~remaining;
}
// Booleans