src/hotspot/share/utilities/vmError.cpp

*** 573,11 ***
     st->print_cr("# JRE version: %s%s%s (%s) (%sbuild %s)", runtime_name,
                  (*vendor_version != '\0') ? " " : "", vendor_version,
                  buf, jdk_debug_level, runtime_version);
  
     // This is the long version with some default settings added
!    st->print_cr("# Java VM: %s%s%s (%s%s, %s%s%s%s%s%s, %s, %s)",
                   VM_Version::vm_name(),
                  (*vendor_version != '\0') ? " " : "", vendor_version,
                   jdk_debug_level,
                   VM_Version::vm_release(),
                   VM_Version::vm_info_string(),
--- 573,11 ---
     st->print_cr("# JRE version: %s%s%s (%s) (%sbuild %s)", runtime_name,
                  (*vendor_version != '\0') ? " " : "", vendor_version,
                  buf, jdk_debug_level, runtime_version);
  
     // This is the long version with some default settings added
!    st->print_cr("# Java VM: %s%s%s (%s%s, %s%s%s%s%s%s%s, %s, %s)",
                   VM_Version::vm_name(),
                  (*vendor_version != '\0') ? " " : "", vendor_version,
                   jdk_debug_level,
                   VM_Version::vm_release(),
                   VM_Version::vm_info_string(),

*** 588,10 ***
--- 588,13 ---
  #else
                   "", "",
  #endif
                   UseCompressedOops ? ", compressed oops" : "",
                   UseCompressedClassPointers ? ", compressed class ptrs" : "",
+                  LockingMode == LM_MONITOR ? ", lm_monitors" :
+                  LockingMode == LM_LEGACY ? ", lm_legacy" :
+                  LockingMode == LM_LIGHTWEIGHT ? ", lm_lightweight" : "",
                   GCConfig::hs_err_name(),
                   VM_Version::vm_platform_string()
                 );
  }
  

*** 1114,11 ***
        _verbose && _context != nullptr && _thread != nullptr && Universe::is_fully_initialized())
      ResourceMark rm(_thread);
      print_stack_location(st, _context, continuation);
      st->cr();
  
!   STEP_IF("printing lock stack", _verbose && _thread != nullptr && _thread->is_Java_thread() && LockingMode == LM_LIGHTWEIGHT);
      st->print_cr("Lock stack of current Java thread (top to bottom):");
      JavaThread::cast(_thread)->lock_stack().print_on(st);
      st->cr();
  
    STEP_IF("printing code blobs if possible", _verbose)
--- 1117,11 ---
        _verbose && _context != nullptr && _thread != nullptr && Universe::is_fully_initialized())
      ResourceMark rm(_thread);
      print_stack_location(st, _context, continuation);
      st->cr();
  
!   STEP_IF("printing lock stack", _verbose && _thread != nullptr && _thread->is_Java_thread() && (LockingMode == LM_LIGHTWEIGHT));
      st->print_cr("Lock stack of current Java thread (top to bottom):");
      JavaThread::cast(_thread)->lock_stack().print_on(st);
      st->cr();
  
    STEP_IF("printing code blobs if possible", _verbose)