1.1 --- a/src/share/vm/oops/instanceClassLoaderKlass.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/oops/instanceClassLoaderKlass.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -36,12 +36,13 @@
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/parNew/parOopClosures.inline.hpp"
1.11 #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
1.12 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
1.13 #include "oops/oop.pcgc.inline.hpp"
1.14 -#endif
1.15 +#endif // INCLUDE_ALL_GCS
1.16
1.17 #define if_do_metadata_checked(closure, nv_suffix) \
1.18 /* Make sure the non-virtual and the virtual versions match. */ \
1.19 @@ -73,7 +74,7 @@
1.20 return size; \
1.21 }
1.22
1.23 -#ifndef SERIALGC
1.24 +#if INCLUDE_ALL_GCS
1.25 #define InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN(OopClosureType, nv_suffix) \
1.26 \
1.27 int InstanceClassLoaderKlass:: \
1.28 @@ -83,7 +84,7 @@
1.29 int size = InstanceKlass::oop_oop_iterate_backwards##nv_suffix(obj, closure); \
1.30 return size; \
1.31 }
1.32 -#endif // !SERIALGC
1.33 +#endif // INCLUDE_ALL_GCS
1.34
1.35
1.36 #define InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN_m(OopClosureType, nv_suffix) \
1.37 @@ -111,10 +112,10 @@
1.38
1.39 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN)
1.40 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN)
1.41 -#ifndef SERIALGC
1.42 +#if INCLUDE_ALL_GCS
1.43 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
1.44 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceClassLoaderKlass_OOP_OOP_ITERATE_BACKWARDS_DEFN)
1.45 -#endif // SERIALGC
1.46 +#endif // INCLUDE_ALL_GCS
1.47 ALL_OOP_OOP_ITERATE_CLOSURES_1(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN_m)
1.48 ALL_OOP_OOP_ITERATE_CLOSURES_2(InstanceClassLoaderKlass_OOP_OOP_ITERATE_DEFN_m)
1.49
1.50 @@ -129,7 +130,7 @@
1.51 }
1.52 }
1.53
1.54 -#ifndef SERIALGC
1.55 +#if INCLUDE_ALL_GCS
1.56 void InstanceClassLoaderKlass::oop_follow_contents(ParCompactionManager* cm,
1.57 oop obj) {
1.58 InstanceKlass::oop_follow_contents(cm, obj);
1.59 @@ -155,5 +156,5 @@
1.60 }
1.61 return size_helper();
1.62 }
1.63 -#endif // SERIALGC
1.64 +#endif // INCLUDE_ALL_GCS
1.65
