From f6909596cae7c47514c10b614cc006169bcee04b Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Mon, 24 May 2021 22:43:42 +0000 Subject: [PATCH] 8267446: Taskqueue code fails with assert(bottom_relaxed() == age_top_relaxed()) failed: not empty Reviewed-by: stefank, pliden --- src/hotspot/share/gc/shared/taskTerminator.cpp | 1 - src/hotspot/share/gc/shared/taskqueue.hpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/gc/shared/taskTerminator.cpp b/src/hotspot/share/gc/shared/taskTerminator.cpp index 0bf1bc61d45..b0d7663c296 100644 --- a/src/hotspot/share/gc/shared/taskTerminator.cpp +++ b/src/hotspot/share/gc/shared/taskTerminator.cpp @@ -78,7 +78,6 @@ TaskTerminator::TaskTerminator(uint n_threads, TaskQueueSetSuper* queue_set) : TaskTerminator::~TaskTerminator() { if (_offered_termination != 0) { assert(_offered_termination == _n_threads, "Must be terminated or aborted"); - assert_queue_set_empty(); } assert(_spin_master == NULL, "Should have been reset"); diff --git a/src/hotspot/share/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp index 718d0929a4e..0342241465c 100644 --- a/src/hotspot/share/gc/shared/taskqueue.hpp +++ b/src/hotspot/share/gc/shared/taskqueue.hpp @@ -465,6 +465,8 @@ public: GenericTaskQueueSet(uint n); ~GenericTaskQueueSet(); + // Set the i'th queue to the provided queue. + // Does not transfer ownership of the queue to this queue set. void register_queue(uint i, T* q); T* queue(uint n);