1.1 --- a/src/share/vm/oops/objArrayKlass.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/oops/objArrayKlass.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -43,7 +43,8 @@
1.4 #include "runtime/handles.inline.hpp"
1.5 #include "runtime/mutexLocker.hpp"
1.6 #include "utilities/copy.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 @@ -54,7 +55,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 ObjArrayKlass* ObjArrayKlass::allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS) {
1.21 assert(ObjArrayKlass::header_size() <= InstanceKlass::header_size(),
1.22 @@ -461,7 +462,7 @@
1.23 }
1.24 }
1.25
1.26 -#ifndef SERIALGC
1.27 +#if INCLUDE_ALL_GCS
1.28 void ObjArrayKlass::oop_follow_contents(ParCompactionManager* cm,
1.29 oop obj) {
1.30 assert(obj->is_array(), "obj must be array");
1.31 @@ -472,7 +473,7 @@
1.32 objarray_follow_contents<oop>(cm, obj, 0);
1.33 }
1.34 }
1.35 -#endif // SERIALGC
1.36 +#endif // INCLUDE_ALL_GCS
1.37
1.38 #define if_do_metadata_checked(closure, nv_suffix) \
1.39 /* Make sure the non-virtual and the virtual versions match. */ \
1.40 @@ -573,7 +574,7 @@
1.41 return size;
1.42 }
1.43
1.44 -#ifndef SERIALGC
1.45 +#if INCLUDE_ALL_GCS
1.46 void ObjArrayKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
1.47 assert(obj->is_objArray(), "obj must be obj array");
1.48 ObjArrayKlass_OOP_ITERATE( \
1.49 @@ -591,7 +592,7 @@
1.50 ObjArrayKlass_OOP_ITERATE(a, p, PSParallelCompact::adjust_pointer(p))
1.51 return size;
1.52 }
1.53 -#endif // SERIALGC
1.54 +#endif // INCLUDE_ALL_GCS
1.55
1.56 // JVM support
1.57
