src/hotspot/share/utilities/vmError.cpp

*** 317,348 ****
     JDK_Version::current().to_string(buf, buflen);
     const char* runtime_name = JDK_Version::runtime_name() != NULL ?
                                  JDK_Version::runtime_name() : "";
     const char* runtime_version = JDK_Version::runtime_version() != NULL ?
                                     JDK_Version::runtime_version() : "";
!    const char* jdk_debug_level = Abstract_VM_Version::printable_jdk_debug_level() != NULL ?
!                                    Abstract_VM_Version::printable_jdk_debug_level() : "";
  
     st->print_cr("# JRE version: %s (%s) (%sbuild %s)", runtime_name, 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)",
!                  Abstract_VM_Version::vm_name(),
                   jdk_debug_level,
!                  Abstract_VM_Version::vm_release(),
!                  Abstract_VM_Version::vm_info_string(),
                   TieredCompilation ? ", tiered" : "",
  #if INCLUDE_JVMCI
                   EnableJVMCI ? ", jvmci" : "",
                   UseJVMCICompiler ? ", jvmci compiler" : "",
  #else
                   "", "",
  #endif
                   UseCompressedOops ? ", compressed oops" : "",
                   GCConfig::hs_err_name(),
!                  Abstract_VM_Version::vm_platform_string()
                 );
  }
  
  // This is the main function to report a fatal error. Only one thread can
  // call this function, so we don't need to worry about MT-safety. But it's
--- 317,348 ----
     JDK_Version::current().to_string(buf, buflen);
     const char* runtime_name = JDK_Version::runtime_name() != NULL ?
                                  JDK_Version::runtime_name() : "";
     const char* runtime_version = JDK_Version::runtime_version() != NULL ?
                                     JDK_Version::runtime_version() : "";
!    const char* jdk_debug_level = VM_Version::printable_jdk_debug_level() != NULL ?
!                                    VM_Version::printable_jdk_debug_level() : "";
  
     st->print_cr("# JRE version: %s (%s) (%sbuild %s)", runtime_name, 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)",
!                  VM_Version::vm_name(),
                   jdk_debug_level,
!                  VM_Version::vm_release(),
!                  VM_Version::vm_info_string(),
                   TieredCompilation ? ", tiered" : "",
  #if INCLUDE_JVMCI
                   EnableJVMCI ? ", jvmci" : "",
                   UseJVMCICompiler ? ", jvmci compiler" : "",
  #else
                   "", "",
  #endif
                   UseCompressedOops ? ", compressed oops" : "",
                   GCConfig::hs_err_name(),
!                  VM_Version::vm_platform_string()
                 );
  }
  
  // This is the main function to report a fatal error. Only one thread can
  // call this function, so we don't need to worry about MT-safety. But it's
*** 987,997 ****
       }
  
    STEP("printing internal vm info")
  
       if (_verbose) {
!        st->print_cr("vm_info: %s", Abstract_VM_Version::internal_vm_info_string());
         st->cr();
       }
  
    // print a defined marker to show that error handling finished correctly.
    STEP("printing end marker")
--- 987,997 ----
       }
  
    STEP("printing internal vm info")
  
       if (_verbose) {
!        st->print_cr("vm_info: %s", VM_Version::internal_vm_info_string());
         st->cr();
       }
  
    // print a defined marker to show that error handling finished correctly.
    STEP("printing end marker")
*** 1150,1160 ****
    os::print_memory_info(st);
    st->cr();
  
    // STEP("printing internal vm info")
  
!   st->print_cr("vm_info: %s", Abstract_VM_Version::internal_vm_info_string());
    st->cr();
  
    // print a defined marker to show that error handling finished correctly.
    // STEP("printing end marker")
  
--- 1150,1160 ----
    os::print_memory_info(st);
    st->cr();
  
    // STEP("printing internal vm info")
  
!   st->print_cr("vm_info: %s", VM_Version::internal_vm_info_string());
    st->cr();
  
    // print a defined marker to show that error handling finished correctly.
    // STEP("printing end marker")