1.1 --- a/src/share/vm/oops/instanceRefKlass.cpp Wed Feb 06 15:22:32 2013 -0800
1.2 +++ b/src/share/vm/oops/instanceRefKlass.cpp Thu Feb 07 16:05:48 2013 -0500
1.3 @@ -33,7 +33,8 @@
1.4 #include "oops/instanceRefKlass.hpp"
1.5 #include "oops/oop.inline.hpp"
1.6 #include "utilities/preserveException.hpp"
1.7 -#ifndef SERIALGC
1.8 +#include "utilities/macros.hpp"
1.9 +#if INCLUDE_ALL_GCS
1.10 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
1.11 #include "gc_implementation/g1/g1OopClosures.inline.hpp"
1.12 #include "gc_implementation/g1/g1RemSet.inline.hpp"
1.13 @@ -42,7 +43,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 template <class T>
1.21 void specialized_oop_follow_contents(InstanceRefKlass* ref, oop obj) {
1.22 @@ -120,7 +121,7 @@
1.23 }
1.24 }
1.25
1.26 -#ifndef SERIALGC
1.27 +#if INCLUDE_ALL_GCS
1.28 template <class T>
1.29 void specialized_oop_follow_contents(InstanceRefKlass* ref,
1.30 ParCompactionManager* cm,
1.31 @@ -194,7 +195,7 @@
1.32 specialized_oop_follow_contents<oop>(this, cm, obj);
1.33 }
1.34 }
1.35 -#endif // SERIALGC
1.36 +#endif // INCLUDE_ALL_GCS
1.37
1.38 #ifdef ASSERT
1.39 template <class T> void trace_reference_gc(const char *s, oop obj,
1.40 @@ -317,7 +318,7 @@
1.41 } \
1.42 }
1.43
1.44 -#ifndef SERIALGC
1.45 +#if INCLUDE_ALL_GCS
1.46 #define InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
1.47 \
1.48 int InstanceRefKlass:: \
1.49 @@ -333,7 +334,7 @@
1.50 InstanceRefKlass_SPECIALIZED_OOP_ITERATE(oop, nv_suffix, contains); \
1.51 } \
1.52 }
1.53 -#endif // !SERIALGC
1.54 +#endif // INCLUDE_ALL_GCS
1.55
1.56
1.57 #define InstanceRefKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
1.58 @@ -354,14 +355,14 @@
1.59
1.60 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceRefKlass_OOP_OOP_ITERATE_DEFN)
1.61 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceRefKlass_OOP_OOP_ITERATE_DEFN)
1.62 -#ifndef SERIALGC
1.63 +#if INCLUDE_ALL_GCS
1.64 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
1.65 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceRefKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
1.66 -#endif // SERIALGC
1.67 +#endif // INCLUDE_ALL_GCS
1.68 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceRefKlass_OOP_OOP_ITERATE_DEFN_m)
1.69 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceRefKlass_OOP_OOP_ITERATE_DEFN_m)
1.70
1.71 -#ifndef SERIALGC
1.72 +#if INCLUDE_ALL_GCS
1.73 template <class T>
1.74 void specialized_oop_push_contents(InstanceRefKlass *ref,
1.75 PSPromotionManager* pm, oop obj) {
1.76 @@ -444,7 +445,7 @@
1.77 }
1.78 return size_helper();
1.79 }
1.80 -#endif // SERIALGC
1.81 +#endif // INCLUDE_ALL_GCS
1.82
1.83 void InstanceRefKlass::update_nonstatic_oop_maps(Klass* k) {
1.84 // Clear the nonstatic oop-map entries corresponding to referent
