--- a/hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp Wed Nov 11 14:40:38 2015 -1000
+++ b/hotspot/src/share/vm/gc/parallel/psPromotionManager.inline.hpp Wed Nov 11 16:32:17 2015 -1000
@@ -260,7 +260,6 @@
new_obj = o->forwardee();
}
-#ifndef PRODUCT
// This code must come after the CAS test, or it will print incorrect
// information.
if (TraceScavenge) {
@@ -268,7 +267,6 @@
should_scavenge(&new_obj) ? "copying" : "tenuring",
new_obj->klass()->internal_name(), p2i((void *)o), p2i((void *)new_obj), new_obj->size());
}
-#endif
return new_obj;
}
@@ -285,15 +283,13 @@
? o->forwardee()
: copy_to_survivor_space<promote_immediately>(o);
-#ifndef PRODUCT
// This code must come after the CAS test, or it will print incorrect
// information.
- if (TraceScavenge && o->is_forwarded()) {
+ if (TraceScavenge && o->is_forwarded()) {
gclog_or_tty->print_cr("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (%d)}",
"forwarding",
new_obj->klass()->internal_name(), p2i((void *)o), p2i((void *)new_obj), new_obj->size());
}
-#endif
oopDesc::encode_store_heap_oop_not_null(p, new_obj);