1.1 --- a/src/share/vm/oops/typeArrayKlass.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/oops/typeArrayKlass.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -39,6 +39,7 @@
1.4 #include "oops/typeArrayKlass.hpp"
1.5 #include "oops/typeArrayOop.hpp"
1.6 #include "runtime/handles.inline.hpp"
1.7 +#include "utilities/macros.hpp"
1.8
1.9 bool TypeArrayKlass::compute_is_subtype_of(Klass* k) {
1.10 if (!k->oop_is_typeArray()) {
1.11 @@ -208,13 +209,13 @@
1.12 // know that Universe::TypeArrayKlass never moves.
1.13 }
1.14
1.15 -#ifndef SERIALGC
1.16 +#if INCLUDE_ALL_GCS
1.17 void TypeArrayKlass::oop_follow_contents(ParCompactionManager* cm, oop obj) {
1.18 assert(obj->is_typeArray(),"must be a type array");
1.19 // Performance tweak: We skip iterating over the klass pointer since we
1.20 // know that Universe::TypeArrayKlass never moves.
1.21 }
1.22 -#endif // SERIALGC
1.23 +#endif // INCLUDE_ALL_GCS
1.24
1.25 int TypeArrayKlass::oop_adjust_pointers(oop obj) {
1.26 assert(obj->is_typeArray(),"must be a type array");
1.27 @@ -240,7 +241,7 @@
1.28 return t->object_size();
1.29 }
1.30
1.31 -#ifndef SERIALGC
1.32 +#if INCLUDE_ALL_GCS
1.33 void TypeArrayKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
1.34 ShouldNotReachHere();
1.35 assert(obj->is_typeArray(),"must be a type array");
1.36 @@ -251,7 +252,7 @@
1.37 assert(obj->is_typeArray(),"must be a type array");
1.38 return typeArrayOop(obj)->object_size();
1.39 }
1.40 -#endif // SERIALGC
1.41 +#endif // INCLUDE_ALL_GCS
1.42
1.43 void TypeArrayKlass::initialize(TRAPS) {
1.44 // Nothing to do. Having this function is handy since objArrayKlasses can be
