Skip to content

Commit 04dcaa3

Browse files
committed
8367721: Test compiler/arguments/TestCompileTaskTimeout.java crashed: SIGSEGV
Reviewed-by: mchevalier, chagedorn
1 parent 4c5e901 commit 04dcaa3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/hotspot/share/compiler/compileBroker.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,15 @@ CompileTaskWrapper::CompileTaskWrapper(CompileTask* task) {
224224

225225
CompileTaskWrapper::~CompileTaskWrapper() {
226226
CompilerThread* thread = CompilerThread::current();
227+
228+
// First, disarm the timeout. This still relies on the underlying task.
229+
thread->timeout()->disarm();
230+
227231
CompileTask* task = thread->task();
228232
CompileLog* log = thread->log();
229233
if (log != nullptr && !task->is_unloaded()) task->log_task_done(log);
230234
thread->set_task(nullptr);
231235
thread->set_env(nullptr);
232-
thread->timeout()->disarm();
233236
if (task->is_blocking()) {
234237
bool free_task = false;
235238
{

0 commit comments

Comments
 (0)