src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp

*** 236,248 ****
    const Klass* class_loader_klass = cld->class_loader_klass();
    if (class_loader_klass == NULL) {
      // (primordial) boot class loader
      writer->write(cld_id); // class loader instance id
      writer->write((traceid)0);  // class loader type id (absence of)
!     writer->write((traceid)CREATE_SYMBOL_ID(1)); // 1 maps to synthetic name -> "boot"
    } else {
!     Symbol* symbol_name = cld->class_loader_name();
      const traceid symbol_name_id = symbol_name != NULL ? artifacts->mark(symbol_name) : 0;
      writer->write(cld_id); // class loader instance id
      writer->write(TRACE_ID(class_loader_klass)); // class loader type id
      writer->write(symbol_name_id == 0 ? (traceid)0 :
        (traceid)CREATE_SYMBOL_ID(symbol_name_id)); // class loader instance name
--- 236,248 ----
    const Klass* class_loader_klass = cld->class_loader_klass();
    if (class_loader_klass == NULL) {
      // (primordial) boot class loader
      writer->write(cld_id); // class loader instance id
      writer->write((traceid)0);  // class loader type id (absence of)
!     writer->write((traceid)CREATE_SYMBOL_ID(1)); // 1 maps to synthetic name -> "bootstrap"
    } else {
!     Symbol* symbol_name = cld->name();
      const traceid symbol_name_id = symbol_name != NULL ? artifacts->mark(symbol_name) : 0;
      writer->write(cld_id); // class loader instance id
      writer->write(TRACE_ID(class_loader_klass)); // class loader type id
      writer->write(symbol_name_id == 0 ? (traceid)0 :
        (traceid)CREATE_SYMBOL_ID(symbol_name_id)); // class loader instance name
*** 439,455 ****
    if (class_loader_klass == NULL) {
      // (primordial) boot class loader
      CStringEntryPtr entry = this->_artifacts->map_cstring(0);
      assert(entry != NULL, "invariant");
      assert(strncmp(entry->literal(),
!       boot_class_loader_name,
!       strlen(boot_class_loader_name)) == 0, "invariant");
      if (_unique_predicate(entry->id())) {
        count += write__artifact__cstring__entry__(this->_writer, entry);
      }
    } else {
!     const Symbol* class_loader_name = cld->class_loader_name();
      if (class_loader_name != NULL) {
        SymbolEntryPtr entry = this->_artifacts->map_symbol(class_loader_name);
        assert(entry != NULL, "invariant");
        if (_unique_predicate(entry->id())) {
          count += write__artifact__symbol__entry__(this->_writer, entry);
--- 439,455 ----
    if (class_loader_klass == NULL) {
      // (primordial) boot class loader
      CStringEntryPtr entry = this->_artifacts->map_cstring(0);
      assert(entry != NULL, "invariant");
      assert(strncmp(entry->literal(),
!       BOOTSTRAP_LOADER_NAME,
!       BOOTSTRAP_LOADER_NAME_LEN) == 0, "invariant");
      if (_unique_predicate(entry->id())) {
        count += write__artifact__cstring__entry__(this->_writer, entry);
      }
    } else {
!     const Symbol* class_loader_name = cld->name();
      if (class_loader_name != NULL) {
        SymbolEntryPtr entry = this->_artifacts->map_symbol(class_loader_name);
        assert(entry != NULL, "invariant");
        if (_unique_predicate(entry->id())) {
          count += write__artifact__symbol__entry__(this->_writer, entry);