src/share/vm/oops/klass.cpp

*** 36,54 ****
  #include "oops/instanceKlass.hpp"
  #include "oops/klass.inline.hpp"
  #include "oops/oop.inline2.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/orderAccess.inline.hpp"
- #include "trace/traceMacros.hpp"
  #include "utilities/stack.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
  #include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
  #include "gc_implementation/parallelScavenge/psScavenge.hpp"
  #endif // INCLUDE_ALL_GCS
  
  bool Klass::is_cloneable() const {
    return _access_flags.is_cloneable() ||
           is_subtype_of(SystemDictionary::Cloneable_klass());
  }
--- 36,56 ----
  #include "oops/instanceKlass.hpp"
  #include "oops/klass.inline.hpp"
  #include "oops/oop.inline2.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/orderAccess.inline.hpp"
  #include "utilities/stack.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc_implementation/parallelScavenge/psParallelCompact.hpp"
  #include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
  #include "gc_implementation/parallelScavenge/psScavenge.hpp"
  #endif // INCLUDE_ALL_GCS
+ #if INCLUDE_JFR
+ #include "jfr/support/jfrTraceIdExtension.hpp"
+ #endif
  
  bool Klass::is_cloneable() const {
    return _access_flags.is_cloneable() ||
           is_subtype_of(SystemDictionary::Cloneable_klass());
  }
*** 195,205 ****
    af.set_flags(0);
    set_access_flags(af);
    set_subklass(NULL);
    set_next_sibling(NULL);
    set_next_link(NULL);
-   TRACE_INIT_ID(this);
  
    set_prototype_header(markOopDesc::prototype());
    set_biased_lock_revocation_count(0);
    set_last_biased_lock_bulk_revocation_time(0);
  
--- 197,206 ----
*** 524,533 ****
--- 525,535 ----
  }
  
  void Klass::remove_unshareable_info() {
    assert (DumpSharedSpaces, "only called for DumpSharedSpaces");
  
+   JFR_ONLY(REMOVE_ID(this);)
    set_subklass(NULL);
    set_next_sibling(NULL);
    // Clear the java mirror
    set_java_mirror(NULL);
    set_next_link(NULL);
*** 535,545 ****
    // Null out class_loader_data because we don't share that yet.
    set_class_loader_data(NULL);
  }
  
  void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
!   TRACE_INIT_ID(this);
    // If an exception happened during CDS restore, some of these fields may already be
    // set.  We leave the class on the CLD list, even if incomplete so that we don't
    // modify the CLD list outside a safepoint.
    if (class_loader_data() == NULL) {
      // Restore class_loader_data
--- 537,547 ----
    // Null out class_loader_data because we don't share that yet.
    set_class_loader_data(NULL);
  }
  
  void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
!   JFR_ONLY(RESTORE_ID(this);)
    // If an exception happened during CDS restore, some of these fields may already be
    // set.  We leave the class on the CLD list, even if incomplete so that we don't
    // modify the CLD list outside a safepoint.
    if (class_loader_data() == NULL) {
      // Restore class_loader_data