except.c (current_function_has_exception_handlers): Function description added and...

2005-06-28  Andreas Krebbel  <krebbel1@de.ibm.com>

	* except.c (current_function_has_exception_handlers): Function
	description added and if statements merged.

From-SVN: r101380

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9626f83..5d32c3d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-28  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+       * except.c (current_function_has_exception_handlers): Function 
+       description added and if statements merged.
+
 2005-06-28  Richard Henderson  <rth@redhat.com>
 
        * config/i386/sse.md (smaxv16qi3): Fix buffer overflow.

diff --git a/gcc/except.c b/gcc/except.c
index 03a80f2..3c42910 100644 (file)
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -826,6 +826,8 @@ find_exception_handler_labels (void)
     add_ehl_entry (return_label, NULL);
 }
 
+/* Returns true if the current function has exception handling regions.  */
+
 bool
 current_function_has_exception_handlers (void)
 {
@@ -835,9 +837,9 @@ current_function_has_exception_handlers (void)
     {
       struct eh_region *region = cfun->eh->region_array[i];
 
-      if (! region || region->region_number != i)
-       continue;
-      if (region->type != ERT_THROW)
+      if (region
+         && region->region_number == i
+         && region->type != ERT_THROW)
        return true;
     }