1.1 --- a/src/share/vm/runtime/vmStructs.cpp Fri Sep 30 22:54:43 2011 -0700 1.2 +++ b/src/share/vm/runtime/vmStructs.cpp Thu Oct 06 13:28:09 2011 -0400 1.3 @@ -182,6 +182,7 @@ 1.4 #include "gc_implementation/parallelScavenge/psVirtualspace.hpp" 1.5 #include "gc_implementation/parallelScavenge/psYoungGen.hpp" 1.6 #include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp" 1.7 +#include "gc_implementation/g1/vmStructs_g1.hpp" 1.8 #endif 1.9 #ifdef COMPILER2 1.10 #include "opto/addnode.hpp" 1.11 @@ -2878,6 +2879,9 @@ 1.12 VM_STRUCTS_CMS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ 1.13 GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ 1.14 GENERATE_STATIC_VM_STRUCT_ENTRY) 1.15 + 1.16 + VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ 1.17 + GENERATE_STATIC_VM_STRUCT_ENTRY) 1.18 #endif // SERIALGC 1.19 1.20 VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, \ 1.21 @@ -2921,6 +2925,9 @@ 1.22 GENERATE_TOPLEVEL_VM_TYPE_ENTRY) 1.23 1.24 VM_TYPES_PARNEW(GENERATE_VM_TYPE_ENTRY) 1.25 + 1.26 + VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY, 1.27 + GENERATE_TOPLEVEL_VM_TYPE_ENTRY) 1.28 #endif // SERIALGC 1.29 1.30 VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY, 1.31 @@ -3020,6 +3027,9 @@ 1.32 VM_STRUCTS_CMS(CHECK_NONSTATIC_VM_STRUCT_ENTRY, 1.33 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY, 1.34 CHECK_STATIC_VM_STRUCT_ENTRY); 1.35 + 1.36 + VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY, 1.37 + CHECK_STATIC_VM_STRUCT_ENTRY); 1.38 #endif // SERIALGC 1.39 1.40 VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY, 1.41 @@ -3060,6 +3070,9 @@ 1.42 CHECK_SINGLE_ARG_VM_TYPE_NO_OP); 1.43 1.44 VM_TYPES_PARNEW(CHECK_VM_TYPE_ENTRY) 1.45 + 1.46 + VM_TYPES_G1(CHECK_VM_TYPE_ENTRY, 1.47 + CHECK_SINGLE_ARG_VM_TYPE_NO_OP); 1.48 #endif // SERIALGC 1.49 1.50 VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY, 1.51 @@ -3125,6 +3138,8 @@ 1.52 debug_only(VM_STRUCTS_CMS(ENSURE_FIELD_TYPE_PRESENT, \ 1.53 ENSURE_FIELD_TYPE_PRESENT, \ 1.54 ENSURE_FIELD_TYPE_PRESENT)); 1.55 + debug_only(VM_STRUCTS_G1(ENSURE_FIELD_TYPE_PRESENT, \ 1.56 + ENSURE_FIELD_TYPE_PRESENT)); 1.57 #endif // SERIALGC 1.58 debug_only(VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT, \ 1.59 ENSURE_FIELD_TYPE_PRESENT, \