src/share/vm/runtime/vmStructs.cpp

*** 167,180 ****
  #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
  #include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
  #include "gc_implementation/g1/vmStructs_g1.hpp"
  #endif // INCLUDE_ALL_GCS
  
- #if INCLUDE_TRACE
-  #include "runtime/vmStructs_trace.hpp"
- #endif
- 
  #ifdef COMPILER2
  #include "opto/addnode.hpp"
  #include "opto/block.hpp"
  #include "opto/callnode.hpp"
  #include "opto/cfgnode.hpp"
--- 167,176 ----
*** 2906,2920 ****
  
    VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                  GENERATE_STATIC_VM_STRUCT_ENTRY)
  #endif // INCLUDE_ALL_GCS
  
- #if INCLUDE_TRACE
-   VM_STRUCTS_TRACE(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-                 GENERATE_STATIC_VM_STRUCT_ENTRY)
- #endif
- 
    VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_STATIC_VM_STRUCT_ENTRY,
                   GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
--- 2902,2911 ----
*** 2956,2970 ****
  
    VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY,
                GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
  #endif // INCLUDE_ALL_GCS
  
- #if INCLUDE_TRACE
-   VM_TYPES_TRACE(GENERATE_VM_TYPE_ENTRY,
-               GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
- #endif
- 
    VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY,
                 GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
                 GENERATE_OOP_VM_TYPE_ENTRY,
                 GENERATE_INTEGER_VM_TYPE_ENTRY,
                 GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY,
--- 2947,2956 ----
*** 2996,3009 ****
    VM_INT_CONSTANTS_CMS(GENERATE_VM_INT_CONSTANT_ENTRY)
  
    VM_INT_CONSTANTS_PARNEW(GENERATE_VM_INT_CONSTANT_ENTRY)
  #endif // INCLUDE_ALL_GCS
  
- #if INCLUDE_TRACE
-   VM_INT_CONSTANTS_TRACE(GENERATE_VM_INT_CONSTANT_ENTRY)
- #endif
- 
    VM_INT_CONSTANTS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
                         GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C1_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C2_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
--- 2982,2991 ----
*** 3065,3079 ****
    VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                  CHECK_STATIC_VM_STRUCT_ENTRY);
  
  #endif // INCLUDE_ALL_GCS
  
- #if INCLUDE_TRACE
-   VM_STRUCTS_TRACE(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
-                 CHECK_STATIC_VM_STRUCT_ENTRY);
- #endif
- 
    VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                   CHECK_STATIC_VM_STRUCT_ENTRY,
                   CHECK_NO_OP,
                   CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
                   CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
--- 3047,3056 ----
*** 3111,3125 ****
    VM_TYPES_G1(CHECK_VM_TYPE_ENTRY,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
  
  #endif // INCLUDE_ALL_GCS
  
- #if INCLUDE_TRACE
-   VM_TYPES_TRACE(CHECK_VM_TYPE_ENTRY,
-               CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
- #endif
- 
    VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
                 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
--- 3088,3097 ----
*** 3179,3193 ****
                              ENSURE_FIELD_TYPE_PRESENT));
    debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT,
                             ENSURE_FIELD_TYPE_PRESENT));
  #endif // INCLUDE_ALL_GCS
  
- #if INCLUDE_TRACE
-   debug_only(VM_STRUCTS_TRACE(ENSURE_FIELD_TYPE_PRESENT,
-                            ENSURE_FIELD_TYPE_PRESENT));
- #endif
- 
    debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT,
                              ENSURE_FIELD_TYPE_PRESENT,
                              CHECK_NO_OP,
                              ENSURE_FIELD_TYPE_PRESENT,
                              ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT,
--- 3151,3160 ----