1.1 --- a/src/share/vm/oops/instanceKlass.cpp Wed Feb 06 15:22:32 2013 -0800
1.2 +++ b/src/share/vm/oops/instanceKlass.cpp Thu Feb 07 16:05:48 2013 -0500
1.3 @@ -56,7 +56,8 @@
1.4 #include "runtime/thread.inline.hpp"
1.5 #include "services/threadService.hpp"
1.6 #include "utilities/dtrace.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 @@ -67,7 +68,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 #ifdef COMPILER1
1.20 #include "c1/c1_Compiler.hpp"
1.21 #endif
1.22 @@ -2043,7 +2044,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 InstanceKlass::oop_follow_contents(ParCompactionManager* cm,
1.29 oop obj) {
1.30 assert(obj != NULL, "can't follow the content of NULL object");
1.31 @@ -2055,7 +2056,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 // closure's do_metadata() method dictates whether the given closure should be
1.39 // applied to the klass ptr in the object header.
1.40 @@ -2083,7 +2084,7 @@
1.41 return size_helper(); \
1.42 }
1.43
1.44 -#ifndef SERIALGC
1.45 +#if INCLUDE_ALL_GCS
1.46 #define InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
1.47 \
1.48 int InstanceKlass::oop_oop_iterate_backwards##nv_suffix(oop obj, \
1.49 @@ -2101,7 +2102,7 @@
1.50 assert_is_in_closed_subset) \
1.51 return size_helper(); \
1.52 }
1.53 -#endif // !SERIALGC
1.54 +#endif // INCLUDE_ALL_GCS
1.55
1.56 #define InstanceKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
1.57 \
1.58 @@ -2125,10 +2126,10 @@
1.59 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DEFN)
1.60 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_DEFN_m)
1.61 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_DEFN_m)
1.62 -#ifndef SERIALGC
1.63 +#if INCLUDE_ALL_GCS
1.64 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
1.65 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
1.66 -#endif // !SERIALGC
1.67 +#endif // INCLUDE_ALL_GCS
1.68
1.69 int InstanceKlass::oop_adjust_pointers(oop obj) {
1.70 int size = size_helper();
1.71 @@ -2140,7 +2141,7 @@
1.72 return size;
1.73 }
1.74
1.75 -#ifndef SERIALGC
1.76 +#if INCLUDE_ALL_GCS
1.77 void InstanceKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
1.78 InstanceKlass_OOP_MAP_REVERSE_ITERATE( \
1.79 obj, \
1.80 @@ -2160,7 +2161,7 @@
1.81 return size;
1.82 }
1.83
1.84 -#endif // SERIALGC
1.85 +#endif // INCLUDE_ALL_GCS
1.86
1.87 void InstanceKlass::clean_implementors_list(BoolObjectClosure* is_alive) {
1.88 assert(is_loader_alive(is_alive), "this klass should be live");
