--- old/src/share/vm/classfile/vmSymbols.hpp 2020-01-16 16:56:29.107510582 +0300 +++ new/src/share/vm/classfile/vmSymbols.hpp 2020-01-16 16:56:29.059512130 +0300 @@ -25,7 +25,9 @@ #ifndef SHARE_VM_CLASSFILE_VMSYMBOLS_HPP #define SHARE_VM_CLASSFILE_VMSYMBOLS_HPP +#if INCLUDE_JFR #include "jfr/support/jfrIntrinsics.hpp" +#endif #include "memory/iterator.hpp" #include "oops/symbol.hpp" #include "utilities/macros.hpp" @@ -608,7 +610,7 @@ template(classLoader_name, "classLoader") \ \ /* jfr signatures */ \ - JFR_TEMPLATES(template) \ + JFR_ONLY(JFR_TEMPLATES(template)) \ \ /*end*/ @@ -737,7 +739,7 @@ do_intrinsic(_nanoTime, java_lang_System, nanoTime_name, void_long_signature, F_S) \ do_name( nanoTime_name, "nanoTime") \ \ - JFR_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias) \ + JFR_ONLY(JFR_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias)) \ \ do_intrinsic(_arraycopy, java_lang_System, arraycopy_name, arraycopy_signature, F_S) \ do_name( arraycopy_name, "arraycopy") \