1.1 --- a/src/share/vm/runtime/frame.cpp Thu Jan 26 09:38:28 2012 +0100
1.2 +++ b/src/share/vm/runtime/frame.cpp Thu Jan 26 16:49:22 2012 +0100
1.3 @@ -1315,7 +1315,6 @@
1.4 }
1.5 #endif
1.6
1.7 -
1.8 #ifdef ASSERT
1.9 void frame::interpreter_frame_verify_monitor(BasicObjectLock* value) const {
1.10 assert(is_interpreted_frame(), "Not an interpreted frame");
1.11 @@ -1331,8 +1330,9 @@
1.12 guarantee((current - low_mark) % monitor_size == 0 , "Misaligned bottom of BasicObjectLock*");
1.13 guarantee( current >= low_mark , "Current BasicObjectLock* below than low_mark");
1.14 }
1.15 +#endif
1.16
1.17 -
1.18 +#ifndef PRODUCT
1.19 void frame::describe(FrameValues& values, int frame_no) {
1.20 // boundaries: sp and the 'real' frame pointer
1.21 values.describe(-1, sp(), err_msg("sp for #%d", frame_no), 1);
1.22 @@ -1436,7 +1436,7 @@
1.23 }
1.24
1.25
1.26 -#ifdef ASSERT
1.27 +#ifndef PRODUCT
1.28
1.29 void FrameValues::describe(int owner, intptr_t* location, const char* description, int priority) {
1.30 FrameValue fv;
1.31 @@ -1449,6 +1449,7 @@
1.32 }
1.33
1.34
1.35 +#ifdef ASSERT
1.36 void FrameValues::validate() {
1.37 _values.sort(compare);
1.38 bool error = false;
1.39 @@ -1474,7 +1475,7 @@
1.40 }
1.41 assert(!error, "invalid layout");
1.42 }
1.43 -
1.44 +#endif // ASSERT
1.45
1.46 void FrameValues::print(JavaThread* thread) {
1.47 _values.sort(compare);
1.48 @@ -1523,4 +1524,4 @@
1.49 }
1.50 }
1.51
1.52 -#endif
1.53 +#endif // ndef PRODUCT
