1.1 --- a/src/share/vm/runtime/vmStructs.cpp Wed Oct 14 16:43:13 2020 +0800
1.2 +++ b/src/share/vm/runtime/vmStructs.cpp Wed Oct 14 17:44:48 2020 +0800
1.3 @@ -181,10 +181,6 @@
1.4 #include "gc_implementation/g1/vmStructs_g1.hpp"
1.5 #endif // INCLUDE_ALL_GCS
1.6
1.7 -#if INCLUDE_TRACE
1.8 - #include "runtime/vmStructs_trace.hpp"
1.9 -#endif
1.10 -
1.11 #ifdef COMPILER2
1.12 #include "opto/addnode.hpp"
1.13 #include "opto/block.hpp"
1.14 @@ -2935,11 +2931,6 @@
1.15 GENERATE_STATIC_VM_STRUCT_ENTRY)
1.16 #endif // INCLUDE_ALL_GCS
1.17
1.18 -#if INCLUDE_TRACE
1.19 - VM_STRUCTS_TRACE(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
1.20 - GENERATE_STATIC_VM_STRUCT_ENTRY)
1.21 -#endif
1.22 -
1.23 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
1.24 GENERATE_STATIC_VM_STRUCT_ENTRY,
1.25 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
1.26 @@ -2985,11 +2976,6 @@
1.27 GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
1.28 #endif // INCLUDE_ALL_GCS
1.29
1.30 -#if INCLUDE_TRACE
1.31 - VM_TYPES_TRACE(GENERATE_VM_TYPE_ENTRY,
1.32 - GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
1.33 -#endif
1.34 -
1.35 VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY,
1.36 GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
1.37 GENERATE_OOP_VM_TYPE_ENTRY,
1.38 @@ -3025,10 +3011,6 @@
1.39 VM_INT_CONSTANTS_PARNEW(GENERATE_VM_INT_CONSTANT_ENTRY)
1.40 #endif // INCLUDE_ALL_GCS
1.41
1.42 -#if INCLUDE_TRACE
1.43 - VM_INT_CONSTANTS_TRACE(GENERATE_VM_INT_CONSTANT_ENTRY)
1.44 -#endif
1.45 -
1.46 VM_INT_CONSTANTS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
1.47 GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
1.48 GENERATE_C1_VM_INT_CONSTANT_ENTRY,
1.49 @@ -3095,11 +3077,6 @@
1.50
1.51 #endif // INCLUDE_ALL_GCS
1.52
1.53 -#if INCLUDE_TRACE
1.54 - VM_STRUCTS_TRACE(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
1.55 - CHECK_STATIC_VM_STRUCT_ENTRY);
1.56 -#endif
1.57 -
1.58 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
1.59 CHECK_STATIC_VM_STRUCT_ENTRY,
1.60 CHECK_NO_OP,
1.61 @@ -3141,11 +3118,6 @@
1.62
1.63 #endif // INCLUDE_ALL_GCS
1.64
1.65 -#if INCLUDE_TRACE
1.66 - VM_TYPES_TRACE(CHECK_VM_TYPE_ENTRY,
1.67 - CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
1.68 -#endif
1.69 -
1.70 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
1.71 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
1.72 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
1.73 @@ -3211,11 +3183,6 @@
1.74 ENSURE_FIELD_TYPE_PRESENT));
1.75 #endif // INCLUDE_ALL_GCS
1.76
1.77 -#if INCLUDE_TRACE
1.78 - debug_only(VM_STRUCTS_TRACE(ENSURE_FIELD_TYPE_PRESENT,
1.79 - ENSURE_FIELD_TYPE_PRESENT));
1.80 -#endif
1.81 -
1.82 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT,
1.83 ENSURE_FIELD_TYPE_PRESENT,
1.84 CHECK_NO_OP,
