diff -r 7a2a740815b7 -r caf115bb98ad src/hotspot/share/classfile/classFileParser.cpp --- a/src/hotspot/share/classfile/classFileParser.cpp Tue May 15 11:28:29 2018 -0700 +++ b/src/hotspot/share/classfile/classFileParser.cpp Tue May 15 20:24:34 2018 +0200 @@ -67,7 +67,6 @@ #include "runtime/timer.hpp" #include "services/classLoadingService.hpp" #include "services/threadService.hpp" -#include "trace/traceMacros.hpp" #include "utilities/align.hpp" #include "utilities/bitMap.inline.hpp" #include "utilities/copy.hpp" @@ -80,6 +79,9 @@ #if INCLUDE_CDS #include "classfile/systemDictionaryShared.hpp" #endif +#if INCLUDE_JFR +#include "jfr/support/jfrTraceIdExtension.hpp" +#endif // We generally try to create the oops directly when parsing, rather than // allocating temporary data structures and copying the bytes twice. A @@ -5639,7 +5641,7 @@ } } - TRACE_INIT_ID(ik); + JFR_ONLY(INIT_ID(ik);) // If we reach here, all is well. // Now remove the InstanceKlass* from the _klass_to_deallocate field