From 1d55adee11fc2fdbf2e009e1308b763fd7217dad Mon Sep 17 00:00:00 2001
From: Francesco Andreuzzi <fandreuzzi@openjdk.org>
Date: Thu, 2 Oct 2025 18:49:00 +0000
Subject: [PATCH] 8368989: Use NMethodMarkingScope and ThreadsClaimTokenScope
 in shenandoahSTWMark

Reviewed-by: shade, ayang
---
 src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
index 260c1e0276f..53391a3e224 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
@@ -24,8 +24,7 @@
  */
 
 
-
-#include "gc/shared/strongRootsScope.hpp"
+#include "code/nmethod.hpp"
 #include "gc/shared/taskTerminator.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "gc/shenandoah/shenandoahClosures.inline.hpp"
@@ -36,10 +35,13 @@
 #include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
 #include "gc/shenandoah/shenandoahSTWMark.hpp"
 #include "gc/shenandoah/shenandoahVerifier.hpp"
+#include "runtime/threads.hpp"
 
 class ShenandoahSTWMarkTask : public WorkerTask {
 private:
   ShenandoahSTWMark* const _mark;
+  NMethodMarkingScope _nmethod_marking_scope;
+  ThreadsClaimTokenScope _threads_claim_token_scope;
 
 public:
   ShenandoahSTWMarkTask(ShenandoahSTWMark* mark);
@@ -48,7 +50,9 @@ public:
 
 ShenandoahSTWMarkTask::ShenandoahSTWMarkTask(ShenandoahSTWMark* mark) :
   WorkerTask("Shenandoah STW mark"),
-  _mark(mark) {
+  _mark(mark),
+  _nmethod_marking_scope(),
+  _threads_claim_token_scope() {
 }
 
 void ShenandoahSTWMarkTask::work(uint worker_id) {
@@ -98,7 +102,6 @@ void ShenandoahSTWMark::mark() {
       _generation->scan_remembered_set(false /* is_concurrent */);
     }
 
-    StrongRootsScope scope(nworkers);
     ShenandoahSTWMarkTask task(this);
     heap->workers()->run_task(&task);