diff -r 25f3e9348905 -r 23f825a42a85 hotspot/src/share/vm/runtime/frame.cpp --- a/hotspot/src/share/vm/runtime/frame.cpp Thu Jan 26 09:38:28 2012 +0100 +++ b/hotspot/src/share/vm/runtime/frame.cpp Thu Jan 26 16:49:22 2012 +0100 @@ -1315,7 +1315,6 @@ } #endif - #ifdef ASSERT void frame::interpreter_frame_verify_monitor(BasicObjectLock* value) const { assert(is_interpreted_frame(), "Not an interpreted frame"); @@ -1331,8 +1330,9 @@ guarantee((current - low_mark) % monitor_size == 0 , "Misaligned bottom of BasicObjectLock*"); guarantee( current >= low_mark , "Current BasicObjectLock* below than low_mark"); } +#endif - +#ifndef PRODUCT void frame::describe(FrameValues& values, int frame_no) { // boundaries: sp and the 'real' frame pointer values.describe(-1, sp(), err_msg("sp for #%d", frame_no), 1); @@ -1436,7 +1436,7 @@ } -#ifdef ASSERT +#ifndef PRODUCT void FrameValues::describe(int owner, intptr_t* location, const char* description, int priority) { FrameValue fv; @@ -1449,6 +1449,7 @@ } +#ifdef ASSERT void FrameValues::validate() { _values.sort(compare); bool error = false; @@ -1474,7 +1475,7 @@ } assert(!error, "invalid layout"); } - +#endif // ASSERT void FrameValues::print(JavaThread* thread) { _values.sort(compare); @@ -1523,4 +1524,4 @@ } } -#endif +#endif // ndef PRODUCT