1.1 --- a/src/share/vm/memory/specialized_oop_closures.hpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/memory/specialized_oop_closures.hpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -26,9 +26,10 @@
1.4 #define SHARE_VM_MEMORY_SPECIALIZED_OOP_CLOSURES_HPP
1.5
1.6 #include "runtime/atomic.hpp"
1.7 -#ifndef SERIALGC
1.8 +#include "utilities/macros.hpp"
1.9 +#if INCLUDE_ALL_GCS
1.10 #include "gc_implementation/g1/g1_specialized_oop_closures.hpp"
1.11 -#endif
1.12 +#endif // INCLUDE_ALL_GCS
1.13
1.14 // The following OopClosure types get specialized versions of
1.15 // "oop_oop_iterate" that invoke the closures' do_oop methods
1.16 @@ -80,20 +81,20 @@
1.17 f(FastScanClosure,_nv) \
1.18 f(FilteringClosure,_nv)
1.19
1.20 -#ifndef SERIALGC
1.21 +#if INCLUDE_ALL_GCS
1.22 #define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_P(f) \
1.23 f(ParScanWithBarrierClosure,_nv) \
1.24 f(ParScanWithoutBarrierClosure,_nv)
1.25 -#else // SERIALGC
1.26 +#else // INCLUDE_ALL_GCS
1.27 #define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_P(f)
1.28 -#endif // SERIALGC
1.29 +#endif // INCLUDE_ALL_GCS
1.30
1.31 #define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_1(f) \
1.32 f(NoHeaderExtendedOopClosure,_nv) \
1.33 SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_S(f) \
1.34 SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_P(f)
1.35
1.36 -#ifndef SERIALGC
1.37 +#if INCLUDE_ALL_GCS
1.38 #define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(f) \
1.39 f(MarkRefsIntoAndScanClosure,_nv) \
1.40 f(Par_MarkRefsIntoAndScanClosure,_nv) \
1.41 @@ -104,9 +105,9 @@
1.42 f(CMSKeepAliveClosure,_nv) \
1.43 f(CMSInnerParMarkAndPushClosure,_nv) \
1.44 FURTHER_SPECIALIZED_OOP_OOP_ITERATE_CLOSURES(f)
1.45 -#else // SERIALGC
1.46 +#else // INCLUDE_ALL_GCS
1.47 #define SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(f)
1.48 -#endif // SERIALGC
1.49 +#endif // INCLUDE_ALL_GCS
1.50
1.51
1.52 // We separate these out, because sometime the general one has
1.53 @@ -120,7 +121,7 @@
1.54 #define ALL_OOP_OOP_ITERATE_CLOSURES_2(f) \
1.55 SPECIALIZED_OOP_OOP_ITERATE_CLOSURES_2(f)
1.56
1.57 -#ifndef SERIALGC
1.58 +#if INCLUDE_ALL_GCS
1.59 // This macro applies an argument macro to all OopClosures for which we
1.60 // want specialized bodies of a family of methods related to
1.61 // "par_oop_iterate". The arguments to f are the same as above.
1.62 @@ -136,7 +137,7 @@
1.63 #define ALL_PAR_OOP_ITERATE_CLOSURES(f) \
1.64 f(ExtendedOopClosure,_v) \
1.65 SPECIALIZED_PAR_OOP_ITERATE_CLOSURES(f)
1.66 -#endif // SERIALGC
1.67 +#endif // INCLUDE_ALL_GCS
1.68
1.69 // This macro applies an argument macro to all OopClosures for which we
1.70 // want specialized bodies of a family of methods related to
1.71 @@ -155,14 +156,14 @@
1.72 f(ScanClosure,_nv) \
1.73 f(FastScanClosure,_nv)
1.74
1.75 -#ifndef SERIALGC
1.76 +#if INCLUDE_ALL_GCS
1.77 #define SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES_YOUNG_P(f) \
1.78 f(ParScanWithBarrierClosure,_nv) \
1.79 f(ParScanWithoutBarrierClosure,_nv) \
1.80 FURTHER_SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES(f)
1.81 -#else // SERIALGC
1.82 +#else // INCLUDE_ALL_GCS
1.83 #define SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES_YOUNG_P(f)
1.84 -#endif // SERIALGC
1.85 +#endif // INCLUDE_ALL_GCS
1.86
1.87 #define SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES_YOUNG(f) \
1.88 SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES_YOUNG_S(f) \
