archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7090259: Fix hotspot sources to build with old compilers

Browse source 
Fixed warnings which prevent building VM with old compilers.

Reviewed-by: never
This commit is contained in:
Vladimir Kozlov 2011-09-13 20:28:00 -07:00
parent 9b101c8ba6
commit f99084037a
5 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hotspot/src/share/vm/oops/instanceRefKlass.cpp
View file

@ -45,7 +45,7 @@
#endif
template <class T>
static void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
T heap_oop = oopDesc::load_heap_oop(referent_addr);
debug_only(
@ -99,7 +99,7 @@ static void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
oop discovered = java_lang_ref_Reference::discovered(obj);
assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
obj));
(oopDesc*)obj));
#endif
}
// treat next as normal oop. next is a link in the reference queue.
@ -179,7 +179,7 @@ void specialized_oop_follow_contents(instanceRefKlass* ref,
oop discovered = java_lang_ref_Reference::discovered(obj);
assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
obj));
(oopDesc*)obj));
#endif
}
PSParallelCompact::mark_and_push(cm, next_addr);
@ -285,7 +285,7 @@ int instanceRefKlass::oop_adjust_pointers(oop obj) {
T disc_oop = oopDesc::load_heap_oop(disc_addr); \
assert(oopDesc::is_null(next_oop) || oopDesc::is_null(disc_oop), \
err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL" \
"discovered field", obj)); \
"discovered field", (oopDesc*)obj)); \
) \
} \
/* treat next as normal oop */ \
@ -403,7 +403,7 @@ void specialized_oop_push_contents(instanceRefKlass *ref,
oop discovered = java_lang_ref_Reference::discovered(obj);
assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
obj));
(oopDesc*)obj));
#endif
}