1.1 --- a/src/share/vm/oops/oop.cpp Wed Jul 28 17:57:43 2010 -0400 1.2 +++ b/src/share/vm/oops/oop.cpp Tue Aug 03 08:13:38 2010 -0400 1.3 @@ -29,15 +29,6 @@ 1.4 1.5 BarrierSet* oopDesc::_bs = NULL; 1.6 1.7 -#ifdef PRODUCT 1.8 -void oopDesc::print_on(outputStream* st) const {} 1.9 -void oopDesc::print_address_on(outputStream* st) const {} 1.10 -char* oopDesc::print_string() { return NULL; } 1.11 -void oopDesc::print() {} 1.12 -void oopDesc::print_address() {} 1.13 - 1.14 -#else //PRODUCT 1.15 - 1.16 void oopDesc::print_on(outputStream* st) const { 1.17 if (this == NULL) { 1.18 st->print_cr("NULL"); 1.19 @@ -62,10 +53,6 @@ 1.20 return st.as_string(); 1.21 } 1.22 1.23 -#endif // PRODUCT 1.24 - 1.25 -// The print_value functions are present in all builds, to support the disassembler. 1.26 - 1.27 void oopDesc::print_value() { 1.28 print_value_on(tty); 1.29 } 1.30 @@ -83,9 +70,7 @@ 1.31 st->print("NULL"); 1.32 } else if (java_lang_String::is_instance(obj)) { 1.33 java_lang_String::print(obj, st); 1.34 -#ifndef PRODUCT 1.35 if (PrintOopAddress) print_address_on(st); 1.36 -#endif //PRODUCT 1.37 #ifdef ASSERT 1.38 } else if (!Universe::heap()->is_in(obj) || !Universe::heap()->is_in(klass())) { 1.39 st->print("### BAD OOP %p ###", (address)obj);