stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8273108: RunThese24H crashes with SEGV in markWord::displaced_mark_helper() after JDK-8268276

Browse Source 
8272809: JFR thread sampler SI_KERNEL SEGV in metaspace::VirtualSpaceList::contains

Reviewed-by: sviswanathan, kvn
This commit is contained in:
Scott Gibbons 2021-12-12 16:08:35 +00:00 committed by Vladimir Kozlov
parent 9b99cbe7ab
commit 9a1bbaf8db
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
View File

@ -6261,6 +6261,9 @@ address generate_avx_ghash_processBlocks() {
__ cmpl(length, 63);
__ jcc(Assembler::lessEqual, L_finalBit);
__ mov64(rax, 0x0000ffffffffffff);
__ kmovql(k2, rax);
__ align32();
__ BIND(L_process64Loop);
@ -6282,7 +6285,7 @@ address generate_avx_ghash_processBlocks() {
__ vpmaddwd(merged0, merge_ab_bc0, pack32_op, Assembler::AVX_512bit);
__ vpermb(merged0, pack24bits, merged0, Assembler::AVX_512bit);
__ evmovdquq(Address(dest, dp), merged0, Assembler::AVX_512bit);
__ evmovdqub(Address(dest, dp), k2, merged0, true, Assembler::AVX_512bit);
__ subl(length, 64);
__ addptr(source, 64);

12
test/hotspot/jtreg/compiler/intrinsics/base64/TestBase64.java
View File

@ -48,6 +48,7 @@ import java.util.Base64.Decoder;
import java.util.Base64.Encoder;
import java.util.Objects;
import java.util.Random;
import java.util.Arrays;
import compiler.whitebox.CompilerWhiteBoxTest;
import sun.hotspot.code.Compiler;
@ -79,9 +80,9 @@ public class TestBase64 {
private static void warmup() {
final int warmupCount = 20_000;
final int bufSize = 60;
final int bufSize = 15308;
byte[] srcBuf = new byte[bufSize];
byte[] encBuf = new byte[(bufSize / 3) * 4];
byte[] encBuf = new byte[((bufSize + 2) / 3) * 4];
byte[] decBuf = new byte[bufSize];
ran.nextBytes(srcBuf);
@ -163,10 +164,13 @@ public class TestBase64 {
assertEqual(resEncodeStr, encodedStr);
// test int decode(byte[], byte[])
resArr = new byte[srcArr.length];
// JDK-8273108: Test for output buffer overrun
resArr = new byte[srcArr.length + 2];
resArr[srcArr.length + 1] = (byte) 167;
len = decoder.decode(encodedArr, resArr);
assertEqual(len, srcArr.length);
assertEqual(resArr, srcArr);
assertEqual(Arrays.copyOfRange(resArr, 0, srcArr.length), srcArr);
assertEqual(resArr[srcArr.length + 1], (byte) 167);
// test byte[] decode(byte[])
resArr = decoder.decode(encodedArr);