From 4728f746a89ca7cb787b3d9969f09a80cc92f502 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Mon, 13 Oct 2025 09:23:48 +0000
Subject: [PATCH] 8369571: Parallel: Use ThreadsClaimTokenScope in PSAdjustTask

Reviewed-by: fandreuzzi, tschatzl
---
 src/hotspot/share/gc/parallel/psParallelCompact.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 9e3c5557ac6..4cdd27cf746 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -1362,6 +1362,7 @@ void PSParallelCompact::adjust_pointers_in_spaces(uint worker_id, volatile uint*
 }
 
 class PSAdjustTask final : public WorkerTask {
+  ThreadsClaimTokenScope                     _threads_claim_token_scope;
   SubTasksDone                               _sub_tasks;
   WeakProcessor::Task                        _weak_proc_task;
   OopStorageSetStrongParState<false, false>  _oop_storage_iter;
@@ -1377,16 +1378,12 @@ class PSAdjustTask final : public WorkerTask {
 public:
   PSAdjustTask(uint nworkers) :
     WorkerTask("PSAdjust task"),
+    _threads_claim_token_scope(),
     _sub_tasks(PSAdjustSubTask_num_elements),
     _weak_proc_task(nworkers),
     _nworkers(nworkers) {
 
     ClassLoaderDataGraph::verify_claimed_marks_cleared(ClassLoaderData::_claim_stw_fullgc_adjust);
-    Threads::change_thread_claim_token();
-  }
-
-  ~PSAdjustTask() {
-    Threads::assert_all_threads_claimed();
   }
 
   void work(uint worker_id) {