1.1 --- a/src/share/vm/oops/instanceMirrorKlass.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/oops/instanceMirrorKlass.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -35,7 +35,8 @@
1.4 #include "oops/oop.inline.hpp"
1.5 #include "oops/symbol.hpp"
1.6 #include "runtime/handles.inline.hpp"
1.7 -#ifndef SERIALGC
1.8 +#include "utilities/macros.hpp"
1.9 +#if INCLUDE_ALL_GCS
1.10 #include "gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp"
1.11 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
1.12 #include "gc_implementation/g1/g1OopClosures.inline.hpp"
1.13 @@ -45,7 +46,7 @@
1.14 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
1.15 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
1.16 #include "oops/oop.pcgc.inline.hpp"
1.17 -#endif
1.18 +#endif // INCLUDE_ALL_GCS
1.19
1.20 int InstanceMirrorKlass::_offset_of_static_fields = 0;
1.21
1.22 @@ -168,7 +169,7 @@
1.23 assert_is_in_closed_subset)
1.24 }
1.25
1.26 -#ifndef SERIALGC
1.27 +#if INCLUDE_ALL_GCS
1.28 void InstanceMirrorKlass::oop_follow_contents(ParCompactionManager* cm,
1.29 oop obj) {
1.30 InstanceKlass::oop_follow_contents(cm, obj);
1.31 @@ -189,7 +190,7 @@
1.32 PSParallelCompact::mark_and_push(cm, p), \
1.33 assert_is_in)
1.34 }
1.35 -#endif // SERIALGC
1.36 +#endif // INCLUDE_ALL_GCS
1.37
1.38 int InstanceMirrorKlass::oop_adjust_pointers(oop obj) {
1.39 int size = oop_size(obj);
1.40 @@ -262,7 +263,7 @@
1.41 } \
1.42 }
1.43
1.44 -#ifndef SERIALGC
1.45 +#if INCLUDE_ALL_GCS
1.46 #define InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
1.47 \
1.48 int InstanceMirrorKlass:: \
1.49 @@ -278,7 +279,7 @@
1.50 InstanceMirrorKlass_SPECIALIZED_OOP_ITERATE_DEFN(oop, nv_suffix); \
1.51 } \
1.52 }
1.53 -#endif // !SERIALGC
1.54 +#endif // INCLUDE_ALL_GCS
1.55
1.56
1.57 #define InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
1.58 @@ -310,14 +311,14 @@
1.59
1.60 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN)
1.61 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN)
1.62 -#ifndef SERIALGC
1.63 +#if INCLUDE_ALL_GCS
1.64 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
1.65 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
1.66 -#endif // SERIALGC
1.67 +#endif // INCLUDE_ALL_GCS
1.68 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m)
1.69 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceMirrorKlass_OOP_OOP_ITERATE_DEFN_m)
1.70
1.71 -#ifndef SERIALGC
1.72 +#if INCLUDE_ALL_GCS
1.73 void InstanceMirrorKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
1.74 // Note that we don't have to follow the mirror -> klass pointer, since all
1.75 // klasses that are dirty will be scavenged when we iterate over the
1.76 @@ -353,7 +354,7 @@
1.77 assert_nothing)
1.78 return size;
1.79 }
1.80 -#endif // SERIALGC
1.81 +#endif // INCLUDE_ALL_GCS
1.82
1.83 int InstanceMirrorKlass::instance_size(KlassHandle k) {
1.84 if (k() != NULL && k->oop_is_instance()) {
