src/share/vm/opto/compile.hpp

*** 29,49 ****
  #include "ci/compilerInterface.hpp"
  #include "code/debugInfoRec.hpp"
  #include "code/exceptionHandlerTable.hpp"
  #include "compiler/compilerOracle.hpp"
  #include "compiler/compileBroker.hpp"
  #include "libadt/dict.hpp"
  #include "libadt/port.hpp"
  #include "libadt/vectset.hpp"
  #include "memory/resourceArea.hpp"
  #include "opto/idealGraphPrinter.hpp"
  #include "opto/phasetype.hpp"
  #include "opto/phase.hpp"
  #include "opto/regmask.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/vmThread.hpp"
- #include "trace/tracing.hpp"
  #include "utilities/ticks.hpp"
  
  class Block;
  class Bundle;
  class C2Compiler;
--- 29,49 ----
  #include "ci/compilerInterface.hpp"
  #include "code/debugInfoRec.hpp"
  #include "code/exceptionHandlerTable.hpp"
  #include "compiler/compilerOracle.hpp"
  #include "compiler/compileBroker.hpp"
+ #include "jfr/jfrEvents.hpp"
  #include "libadt/dict.hpp"
  #include "libadt/port.hpp"
  #include "libadt/vectset.hpp"
  #include "memory/resourceArea.hpp"
  #include "opto/idealGraphPrinter.hpp"
  #include "opto/phasetype.hpp"
  #include "opto/phase.hpp"
  #include "opto/regmask.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/vmThread.hpp"
  #include "utilities/ticks.hpp"
  
  class Block;
  class Bundle;
  class C2Compiler;
*** 635,645 ****
    void print_method(CompilerPhaseType cpt, int level = 1) {
      EventCompilerPhase event;
      if (event.should_commit()) {
        event.set_starttime(C->_latest_stage_start_counter);
        event.set_phase((u1) cpt);
!       event.set_compileID(C->_compile_id);
        event.set_phaseLevel(level);
        event.commit();
      }
  
  
--- 635,645 ----
    void print_method(CompilerPhaseType cpt, int level = 1) {
      EventCompilerPhase event;
      if (event.should_commit()) {
        event.set_starttime(C->_latest_stage_start_counter);
        event.set_phase((u1) cpt);
!       event.set_compileId(C->_compile_id);
        event.set_phaseLevel(level);
        event.commit();
      }
  
  
*** 652,662 ****
    void end_method(int level = 1) {
      EventCompilerPhase event;
      if (event.should_commit()) {
        event.set_starttime(C->_latest_stage_start_counter);
        event.set_phase((u1) PHASE_END);
!       event.set_compileID(C->_compile_id);
        event.set_phaseLevel(level);
        event.commit();
      }
  #ifndef PRODUCT
      if (_printer) _printer->end_method();
--- 652,662 ----
    void end_method(int level = 1) {
      EventCompilerPhase event;
      if (event.should_commit()) {
        event.set_starttime(C->_latest_stage_start_counter);
        event.set_phase((u1) PHASE_END);
!       event.set_compileId(C->_compile_id);
        event.set_phaseLevel(level);
        event.commit();
      }
  #ifndef PRODUCT
      if (_printer) _printer->end_method();