--- a/hotspot/src/share/vm/oops/objArrayKlass.hpp Thu Mar 25 16:54:59 2010 -0700
+++ b/hotspot/src/share/vm/oops/objArrayKlass.hpp Fri Mar 26 11:10:26 2010 -0400
@@ -91,10 +91,18 @@
// Garbage collection
void oop_follow_contents(oop obj);
+ inline void oop_follow_contents(oop obj, int index);
+ template <class T> inline void objarray_follow_contents(oop obj, int index);
+
int oop_adjust_pointers(oop obj);
// Parallel Scavenge and Parallel Old
PARALLEL_GC_DECLS
+#ifndef SERIALGC
+ inline void oop_follow_contents(ParCompactionManager* cm, oop obj, int index);
+ template <class T> inline void
+ objarray_follow_contents(ParCompactionManager* cm, oop obj, int index);
+#endif // !SERIALGC
// Iterators
int oop_oop_iterate(oop obj, OopClosure* blk) {
@@ -131,5 +139,4 @@
void oop_verify_on(oop obj, outputStream* st);
void oop_verify_old_oop(oop obj, oop* p, bool allow_dirty);
void oop_verify_old_oop(oop obj, narrowOop* p, bool allow_dirty);
-
};