aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/except.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 016586b..fc9e902 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-08 Mark Mitchell <mark@codesourcery.com>
+
+ * except.c (expand_eh_region_end_allowed): Call
+ do_pending_stack_adjust as necessary.
+
Fri Jun 8 14:16:33 CEST 2001 Jan Hubicka <jh@suse.cz>
* function.c (clobber_return_register): Clobber the pseudo return
diff --git a/gcc/except.c b/gcc/except.c
index e59afc6..5ad9071 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -857,11 +857,19 @@ expand_eh_region_end_allowed (allowed, failure)
throws a different exception, that it will be processed by the
correct region. */
+ /* If there are any pending stack adjustments, we must emit them
+ before we branch -- otherwise, we won't know how much adjustment
+ is required later. */
+ do_pending_stack_adjust ();
around_label = gen_label_rtx ();
emit_jump (around_label);
emit_label (region->label);
expand_expr (failure, const0_rtx, VOIDmode, EXPAND_NORMAL);
+ /* We must adjust the stack before we reach the AROUND_LABEL because
+ the call to FAILURE does not occur on all paths to the
+ AROUND_LABEL. */
+ do_pending_stack_adjust ();
emit_label (around_label);
}