src/hotspot/share/utilities/vmError.cpp

*** 25,35 ****
  #include "precompiled.hpp"
  #include "jvm.h"
  #include "code/codeCache.hpp"
  #include "compiler/compileBroker.hpp"
  #include "compiler/disassembler.hpp"
! #include "gc/shared/collectedHeap.hpp"
  #include "logging/logConfiguration.hpp"
  #include "memory/resourceArea.hpp"
  #include "prims/whitebox.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/atomic.hpp"
--- 25,35 ----
  #include "precompiled.hpp"
  #include "jvm.h"
  #include "code/codeCache.hpp"
  #include "compiler/compileBroker.hpp"
  #include "compiler/disassembler.hpp"
! #include "gc/shared/gcConfig.hpp"
  #include "logging/logConfiguration.hpp"
  #include "memory/resourceArea.hpp"
  #include "prims/whitebox.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/atomic.hpp"
*** 302,319 ****
      }
    }
    st->print_cr("# This output file may be truncated or incomplete.");
  }
  
- static const char* gc_mode() {
-   if (UseG1GC)            return "g1 gc";
-   if (UseParallelGC)      return "parallel gc";
-   if (UseConcMarkSweepGC) return "concurrent mark sweep gc";
-   if (UseSerialGC)        return "serial gc";
-   return "ERROR in GC mode";
- }
- 
  static void report_vm_version(outputStream* st, char* buf, int buflen) {
     // VM version
     st->print_cr("#");
     JDK_Version::current().to_string(buf, buflen);
     const char* runtime_name = JDK_Version::runtime_name() != NULL ?
--- 302,311 ----
*** 338,348 ****
                   UseJVMCICompiler ? ", jvmci compiler" : "",
  #else
                   "", "",
  #endif
                   UseCompressedOops ? ", compressed oops" : "",
!                  gc_mode(),
                   Abstract_VM_Version::vm_platform_string()
                 );
  }
  
  // This is the main function to report a fatal error. Only one thread can
--- 330,340 ----
                   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