/hg/icedtea6: PR icedtea/498: Catch-all handler can be unloaded.

[xranby at icedtea.classpath.org]

changeset bd443070a313 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bd443070a313
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Jul 19 14:39:53 2010 +0200

	PR icedtea/498: Catch-all handler can be unloaded.

	2010-07-19 Gary Benson <gbenson at redhat.com> Xerxes
	R?nby <xerxes at zafena.se>

	 PR icedtea/498
	        * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
	(SharkTopLevelBlock::handle_exception): Catch-all handler can be
	unloaded.


diffstat:

2 files changed, 8 insertions(+), 5 deletions(-)
ChangeLog                                               |    7 +++++++
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |    6 +-----

diffs (30 lines):

diff -r b4455c6c313f -r bd443070a313 ChangeLog
--- a/ChangeLog	Fri Jul 16 15:19:55 2010 -0400
+++ b/ChangeLog	Mon Jul 19 14:39:53 2010 +0200
@@ -1,3 +1,10 @@ 2010-07-16  Deepak Bhole <dbhole at redhat.
+2010-07-19  Gary Benson  <gbenson at redhat.com>
+            Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	PR icedtea/498
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
+	(SharkTopLevelBlock::handle_exception): Catch-all handler can be unloaded.
+
 2010-07-16  Deepak Bhole <dbhole at redhat.com>
 
 	* patches/icedtea-policy-evaluation.patch: New patch. Fixes policy
diff -r b4455c6c313f -r bd443070a313 ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Fri Jul 16 15:19:55 2010 -0400
+++ b/ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp	Mon Jul 19 14:39:53 2010 +0200
@@ -526,11 +526,7 @@ void SharkTopLevelBlock::handle_exceptio
 
     // Install the catch-all handler, if present
     if (has_catch_all) {
-      SharkTopLevelBlock* handler = this->exception(num_options);
-      assert(handler != NULL, "catch-all handler cannot be unloaded");
-
-      builder()->CreateBr(handler->entry_block());
-      handler->add_incoming(current_state());
+      builder()->CreateBr(handler_for_exception(num_options));
       return;
     }
   }