aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>1999-11-18 17:52:27 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>1999-11-18 17:52:27 +0000
commit4a6ef811c845111d1988d027ec7c5fd3e787fdd3 (patch)
tree9aa3abef5f4b32b710b0a27b1fb9c50e50a6cfbf
parent1e4ceb6f9ea4f1e0d5afccbf4a135f47b0110b79 (diff)
downloadgcc-4a6ef811c845111d1988d027ec7c5fd3e787fdd3.zip
gcc-4a6ef811c845111d1988d027ec7c5fd3e787fdd3.tar.gz
gcc-4a6ef811c845111d1988d027ec7c5fd3e787fdd3.tar.bz2
except.c (expand_end_catch_block): Fix typo.
* except.c (expand_end_catch_block): Fix typo. (expand_exception_blocks): Simplify. Don't call expand_leftover_cleanups. From-SVN: r30577
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/except.c13
2 files changed, 10 insertions, 9 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9bdfe91..a8598e8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+1999-11-18 Mark Mitchell <mark@codesourcery.com>
+
+ * except.c (expand_end_catch_block): Fix typo.
+ (expand_exception_blocks): Simplify. Don't call
+ expand_leftover_cleanups.
+
1999-11-15 Jason Merrill <jason@casey.cygnus.com>
* cp-tree.h, decl.c (compute_array_index_type): Make nonstatic.
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 91a4407..eb8cf0e 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -563,9 +563,9 @@ expand_end_catch_block (blocks)
finish_expr_stmt (build_throw (NULL_TREE));
/* Cleanup the EH parameter. */
- finish_compound_stmt (/*has_no_scope=*/0, compound_stmt_1);
- /* Cleanup the EH object. */
finish_compound_stmt (/*has_no_scope=*/0, compound_stmt_2);
+ /* Cleanup the EH object. */
+ finish_compound_stmt (/*has_no_scope=*/0, compound_stmt_1);
}
/* An exception spec is implemented more or less like:
@@ -656,11 +656,6 @@ void
expand_exception_blocks ()
{
do_pending_stack_adjust ();
- push_to_sequence (catch_clauses);
- expand_leftover_cleanups ();
- do_pending_stack_adjust ();
- catch_clauses = get_insns ();
- end_sequence ();
if (catch_clauses)
{
@@ -679,8 +674,8 @@ expand_exception_blocks ()
if (exceptions_via_longjmp == 0)
expand_eh_region_end (build_terminate_handler ());
- expand_leftover_cleanups ();
-
+ emit_insns (catch_clauses);
+ catch_clauses = NULL_RTX;
emit_label (funcend);
}
}