Remove duplicated Carrying statement and indent vthread stack

Author: txominpelu

src/hotspot/share/runtime/javaThread.cpp

@@ -1522,14 +1522,8 @@ void JavaThread::print_on(outputStream *st, bool print_extended_info) const {
   Thread::print_on(st, print_extended_info);
   // print guess for valid stack memory region (assume 4K pages); helps lock debugging
   st->print_cr("[" INTPTR_FORMAT "]", (intptr_t)last_Java_sp() & ~right_n_bits(12));
-  if (thread_oop != nullptr) {
-    if (is_vthread_mounted()) {
-      oop vt = vthread();
-      assert(vt != nullptr, "");
-      st->print_cr("   Carrying virtual thread #" INT64_FORMAT, (int64_t)java_lang_Thread::thread_id(vt));
-    } else {
-      st->print_cr("   java.lang.Thread.State: %s", java_lang_Thread::thread_status_name(thread_oop));
-    }
+  if (thread_oop != nullptr && !is_vthread_mounted()) {
+    st->print_cr("   java.lang.Thread.State: %s", java_lang_Thread::thread_status_name(thread_oop));
   }
 #ifndef PRODUCT
   _safepoint_state->print_on(st);

src/hotspot/share/runtime/threads.cpp

@@ -1328,13 +1328,12 @@ void Threads::print_on(outputStream* st, bool print_stacks,
       if (internal_format) {
         p->trace_stack();
       } else {
-        p->print_stack_on(st);
         oop thread_oop = p->threadObj();
         if (thread_oop != nullptr) {
           if (p->is_vthread_mounted()) {
             oop vt = p->vthread();
             assert(vt != nullptr, "");
-            st->print_cr("   Carrying virtual thread #" INT64_FORMAT, (int64_t)java_lang_Thread::thread_id(vt));
+            st->print_cr("   \tCarrying virtual thread #" INT64_FORMAT, (int64_t)java_lang_Thread::thread_id(vt));
             // Very slightly modified copy of what GetStackTraceClosure does
             const int max_depth = MaxJavaStackTraceDepth;
             const bool skip_hidden = !ShowHiddenFrames;
@@ -1347,11 +1346,13 @@ void Threads::print_on(outputStream* st, bool print_stacks,
                                   vfst.method()->is_continuation_enter_intrinsic())) {
                 continue;
               }
+              st->print("\t"); // Indent
               java_lang_Throwable::print_stack_element(st, vfst.method(), vfst.bci());
               total_count++;
             }
           }
         }
+        p->print_stack_on(st);
       }
     }
     st->cr();