1.1 --- a/src/share/vm/classfile/vmSymbols.hpp Wed Oct 14 16:43:13 2020 +0800
1.2 +++ b/src/share/vm/classfile/vmSymbols.hpp Wed Oct 14 17:44:48 2020 +0800
1.3 @@ -25,9 +25,10 @@
1.4 #ifndef SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
1.5 #define SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
1.6
1.7 +#include "jfr/support/jfrIntrinsics.hpp"
1.8 +#include "memory/iterator.hpp"
1.9 #include "oops/symbol.hpp"
1.10 -#include "memory/iterator.hpp"
1.11 -#include "trace/traceMacros.hpp"
1.12 +#include "utilities/macros.hpp"
1.13
1.14 // The class vmSymbols is a name space for fast lookup of
1.15 // symbols commonly used in the VM.
1.16 @@ -606,8 +607,8 @@
1.17 template(classRedefinedCount_name, "classRedefinedCount") \
1.18 template(classLoader_name, "classLoader") \
1.19 \
1.20 - /* trace signatures */ \
1.21 - TRACE_TEMPLATES(template) \
1.22 + /* jfr signatures */ \
1.23 + JFR_TEMPLATES(template) \
1.24 \
1.25 /*end*/
1.26
1.27 @@ -736,7 +737,7 @@
1.28 do_intrinsic(_nanoTime, java_lang_System, nanoTime_name, void_long_signature, F_S) \
1.29 do_name( nanoTime_name, "nanoTime") \
1.30 \
1.31 - TRACE_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias) \
1.32 + JFR_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias) \
1.33 \
1.34 do_intrinsic(_arraycopy, java_lang_System, arraycopy_name, arraycopy_signature, F_S) \
1.35 do_name( arraycopy_name, "arraycopy") \
