src/share/vm/runtime/java.cpp

*** 28,39 ****
--- 28,41 ----
  #include "classfile/systemDictionary.hpp"
  #include "code/codeCache.hpp"
  #include "compiler/compileBroker.hpp"
  #include "compiler/compilerOracle.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
+ #if INCLUDE_JFR
  #include "jfr/jfrEvents.hpp"
  #include "jfr/support/jfrThreadId.hpp"
+ #endif
  #include "memory/genCollectedHeap.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/universe.hpp"
  #include "oops/constantPool.hpp"
  #include "oops/generateOopMap.hpp"
*** 523,537 ****
--- 525,541 ----
    if (JvmtiExport::should_post_thread_life()) {
      JvmtiExport::post_thread_end(thread);
    }
  
  
+ #if INCLUDE_JFR
    EventThreadEnd event;
    if (event.should_commit()) {
      event.set_thread(JFR_THREAD_ID(thread));
      event.commit();
    }
+ #endif
  
    JFR_ONLY(Jfr::on_vm_shutdown();)
  
    // Always call even when there are not JVMTI environments yet, since environments
    // may be attached late and JVMTI must track phases of VM execution