src/share/vm/runtime/java.cpp

*** 29,38 ****
--- 29,42 ----
  #include "code/codeCache.hpp"
  #include "compiler/compileBroker.hpp"
  #include "compiler/compilerOracle.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
+ #if INCLUDE_JVMCI
+ #include "jvmci/jvmciCompiler.hpp"
+ #include "jvmci/jvmciRuntime.hpp"
+ #endif
  #include "memory/oopFactory.hpp"
  #include "memory/universe.hpp"
  #include "oops/constantPool.hpp"
  #include "oops/generateOopMap.hpp"
  #include "oops/instanceKlass.hpp"
*** 234,254 ****
    if ((PrintC1Statistics || LogVMOutput || LogCompilation) && UseCompiler) {
      FlagSetting fs(DisplayVMOutput, DisplayVMOutput && PrintC1Statistics);
      Runtime1::print_statistics();
      Deoptimization::print_statistics();
      SharedRuntime::print_statistics();
-     nmethod::print_statistics();
    }
  #endif /* COMPILER1 */
  
  #ifdef COMPILER2
    if ((PrintOptoStatistics || LogVMOutput || LogCompilation) && UseCompiler) {
      FlagSetting fs(DisplayVMOutput, DisplayVMOutput && PrintOptoStatistics);
      Compile::print_statistics();
  #ifndef COMPILER1
      Deoptimization::print_statistics();
-     nmethod::print_statistics();
      SharedRuntime::print_statistics();
  #endif //COMPILER1
      os::print_statistics();
    }
  
--- 238,256 ----
*** 262,272 ****
  #ifdef ASSERT
    if (CollectIndexSetStatistics) {
      IndexSet::print_statistics();
    }
  #endif // ASSERT
! #endif // COMPILER2
    if (CountCompiledCalls) {
      print_method_invocation_histogram();
    }
  
    print_method_profiling_data();
--- 264,288 ----
  #ifdef ASSERT
    if (CollectIndexSetStatistics) {
      IndexSet::print_statistics();
    }
  #endif // ASSERT
! #else
! #ifdef INCLUDE_JVMCI
! #ifndef COMPILER1
!   if ((TraceDeoptimization || LogVMOutput || LogCompilation) && UseCompiler) {
!     FlagSetting fs(DisplayVMOutput, DisplayVMOutput && TraceDeoptimization);
!     Deoptimization::print_statistics();
!     SharedRuntime::print_statistics();
!   }
! #endif
! #endif
! #endif
! 
!   if (PrintNMethodStatistics) {
!     nmethod::print_statistics();
!   }
    if (CountCompiledCalls) {
      print_method_invocation_histogram();
    }
  
    print_method_profiling_data();
*** 407,416 ****
--- 423,436 ----
      case BEFORE_EXIT_DONE:
        return;
      }
    }
  
+ #if INCLUDE_JVMCI
+   JVMCIRuntime::shutdown();
+ #endif
+ 
    // Hang forever on exit if we're reporting an error.
    if (ShowMessageBoxOnError && is_error_reported()) {
      os::infinite_sleep();
    }