changeset in /hg/icedtea6: 2008-04-10 Gary Benson <gbenson at red...

[Gary Benson]

changeset ec481ef8f3d8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ec481ef8f3d8
description:
	2008-04-10  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
		(ZeroStackPrinter::print): Fail gracefully when not set up.

diffstat:

2 files changed, 14 insertions(+), 3 deletions(-)
ChangeLog                                           |    5 +++++
ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp |   12 +++++++++---

diffs (35 lines):

diff -r a6ab5c3d9b22 -r ec481ef8f3d8 ChangeLog
--- a/ChangeLog	Thu Apr 10 05:33:07 2008 -0400
+++ b/ChangeLog	Thu Apr 10 05:39:54 2008 -0400
@@ -1,3 +1,8 @@ 2008-04-10  Gary Benson  <gbenson at redhat
+2008-04-10  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
+	(ZeroStackPrinter::print): Fail gracefully when not set up.
+
 2008-04-10  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/javaStack_zero.hpp: Renamed as...
diff -r a6ab5c3d9b22 -r ec481ef8f3d8 ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp	Thu Apr 10 05:33:07 2008 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp	Thu Apr 10 05:39:54 2008 -0400
@@ -36,10 +36,16 @@ class ZeroStackPrinter {
   void print(JavaThread *thread)
   {
     intptr_t *lo_addr = thread->zero_stack()->sp();
+    if (!lo_addr) {
+      _st->print(" stack not set up");
+      return;
+    }
+
     intptr_t *hi_addr = (intptr_t *) thread->top_zero_frame();
-
-    assert(lo_addr, "stack not set up?");
-    assert(hi_addr, "no frames pushed?");
+    if (!hi_addr) {
+      _st->print("no frames pushed"); 
+      return;
+    }
     assert(hi_addr >= lo_addr, "corrupted stack");
 
     bool top_frame = true;