1.1 --- a/src/share/vm/oops/instanceRefKlass.cpp Tue Sep 13 16:58:35 2011 -0700
1.2 +++ b/src/share/vm/oops/instanceRefKlass.cpp Tue Sep 13 20:28:00 2011 -0700
1.3 @@ -45,7 +45,7 @@
1.4 #endif
1.5
1.6 template <class T>
1.7 -static void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
1.8 +void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
1.9 T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
1.10 T heap_oop = oopDesc::load_heap_oop(referent_addr);
1.11 debug_only(
1.12 @@ -99,7 +99,7 @@
1.13 oop discovered = java_lang_ref_Reference::discovered(obj);
1.14 assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
1.15 err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
1.16 - obj));
1.17 + (oopDesc*)obj));
1.18 #endif
1.19 }
1.20 // treat next as normal oop. next is a link in the reference queue.
1.21 @@ -179,7 +179,7 @@
1.22 oop discovered = java_lang_ref_Reference::discovered(obj);
1.23 assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
1.24 err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
1.25 - obj));
1.26 + (oopDesc*)obj));
1.27 #endif
1.28 }
1.29 PSParallelCompact::mark_and_push(cm, next_addr);
1.30 @@ -285,7 +285,7 @@
1.31 T disc_oop = oopDesc::load_heap_oop(disc_addr); \
1.32 assert(oopDesc::is_null(next_oop) || oopDesc::is_null(disc_oop), \
1.33 err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL" \
1.34 - "discovered field", obj)); \
1.35 + "discovered field", (oopDesc*)obj)); \
1.36 ) \
1.37 } \
1.38 /* treat next as normal oop */ \
1.39 @@ -403,7 +403,7 @@
1.40 oop discovered = java_lang_ref_Reference::discovered(obj);
1.41 assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
1.42 err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
1.43 - obj));
1.44 + (oopDesc*)obj));
1.45 #endif
1.46 }
1.47
