From 3b519ee1d8a2b85a25773c4ea66be371a5334578 Mon Sep 17 00:00:00 2001
From: MBaesken <matthias.baesken@sap.com>
Date: Tue, 9 Jul 2024 12:28:48 +0200
Subject: [PATCH] Backport c1cfb43d8de8d0eed01b9bb6aa1202dc7cbff007

---
 src/hotspot/share/runtime/thread.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 03498ab7765..fe4f555df2a 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -3828,14 +3828,7 @@ void Threads::print_on(outputStream* st, bool print_stacks,
   }
 
   PrintOnClosure cl(st);
-  cl.do_thread(VMThread::vm_thread());
-  Universe::heap()->gc_threads_do(&cl);
-  if (StringDedup::is_enabled()) {
-    StringDedup::threads_do(&cl);
-  }
-  cl.do_thread(WatcherThread::watcher_thread());
-  cl.do_thread(AsyncLogWriter::instance());
-
+  non_java_threads_do(&cl);
   st->flush();
 }