infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 13:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

8356648: runtime/Thread/AsyncExceptionTest.java fails with +StressCompiledExceptionHandlers

Browse Source 
Reviewed-by: thartmann, kvn
This commit is contained in:
Dean Long 2025-05-29 21:41:49 +00:00
parent cb8eea4ecd
commit 648c337bea
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/c1/c1_Runtime1.cpp
View File

@ -508,7 +508,7 @@ static nmethod* counter_overflow_helper(JavaThread* current, int branch_bci, Met
JRT_BLOCK_ENTRY(address, Runtime1::counter_overflow(JavaThread* current, int bci, Method* method))
nmethod* osr_nm;
JRT_BLOCK
JRT_BLOCK_NO_ASYNC
osr_nm = counter_overflow_helper(current, bci, method);
if (osr_nm != nullptr) {
RegisterMap map(current,

51
test/hotspot/jtreg/runtime/Thread/AsyncExceptionTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -27,11 +27,17 @@
* @requires vm.compiler1.enabled | vm.compiler2.enabled
* @summary Stress delivery of asynchronous exceptions.
* @library /test/hotspot/jtreg/testlibrary
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+StressCompiledExceptionHandlers
* -Xcomp -XX:TieredStopAtLevel=3
* -XX:CompileCommand=dontinline,AsyncExceptionTest::internalRun2
* -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun1
* -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun2
* AsyncExceptionTest
* @run main/othervm -Xcomp
-XX:CompileCommand=dontinline,AsyncExceptionTest::internalRun2
-XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun1
-XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun2
AsyncExceptionTest
* -XX:CompileCommand=dontinline,AsyncExceptionTest::internalRun2
* -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun1
* -XX:CompileCommand=compileonly,AsyncExceptionTest::internalRun2
* AsyncExceptionTest
*/
import jvmti.JVMTIUtils;
@ -42,19 +48,19 @@ public class AsyncExceptionTest extends Thread {
private final static int DEF_TIME_MAX = 30; // default max # secs to test
private final static String PROG_NAME = "AsyncExceptionTest";
public CountDownLatch exitSyncObj = new CountDownLatch(1);
public CountDownLatch startSyncObj = new CountDownLatch(1);
private boolean firstEntry = true;
private boolean receivedThreadDeathinInternal1 = false;
private boolean receivedThreadDeathinInternal2 = false;
private volatile RuntimeException error = null;
@Override
public void run() {
try {
internalRun1();
} catch (ThreadDeath td) {
throw new RuntimeException("Caught ThreadDeath in run() instead of internalRun2() or internalRun1().\n"
error = new RuntimeException("Caught ThreadDeath in run() instead of internalRun2() or internalRun1().\n"
+ "receivedThreadDeathinInternal1=" + receivedThreadDeathinInternal1
+ "; receivedThreadDeathinInternal2=" + receivedThreadDeathinInternal2);
} catch (NoClassDefFoundError ncdfe) {
@ -62,11 +68,10 @@ public class AsyncExceptionTest extends Thread {
}
if (receivedThreadDeathinInternal2 == false && receivedThreadDeathinInternal1 == false) {
throw new RuntimeException("Didn't catch ThreadDeath in internalRun2() nor in internalRun1().\n"
error = new RuntimeException("Didn't catch ThreadDeath in internalRun2() nor in internalRun1().\n"
+ "receivedThreadDeathinInternal1=" + receivedThreadDeathinInternal1
+ "; receivedThreadDeathinInternal2=" + receivedThreadDeathinInternal2);
}
exitSyncObj.countDown();
}
public void internalRun1() {
@ -123,18 +128,9 @@ public class AsyncExceptionTest extends Thread {
try {
// Wait for the worker thread to get going.
thread.startSyncObj.await();
while (true) {
// Send async exception and wait until it is thrown
JVMTIUtils.stopThread(thread);
thread.exitSyncObj.await();
Thread.sleep(100);
if (!thread.isAlive()) {
// Done with Thread.stop() calls since
// thread is not alive.
break;
}
}
// Send async exception and wait until it is thrown
JVMTIUtils.stopThread(thread);
thread.join();
} catch (InterruptedException e) {
throw new Error("Unexpected: " + e);
} catch (NoClassDefFoundError ncdfe) {
@ -143,11 +139,14 @@ public class AsyncExceptionTest extends Thread {
// in a worker thread can subsequently be seen in the
// main thread.
}
try {
thread.join();
} catch (InterruptedException e) {
throw new Error("Unexpected: " + e);
if (thread.isAlive()) {
// Really shouldn't be possible after join() above...
throw new RuntimeException("Thread did not exit.\n"
+ "receivedThreadDeathinInternal1=" + thread.receivedThreadDeathinInternal1
+ "; receivedThreadDeathinInternal2=" + thread.receivedThreadDeathinInternal2);
}
if (thread.error != null) {
throw thread.error;
}
}