diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1997-11-12 03:55:00 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1997-11-11 22:55:00 -0500 |
| commit | 0b3ca5ee97993095632bea6f5586393583263cbf (patch) | |
| tree | 1fbd98c9cd1c63fa67e01a80d5f6d55838ae9122 /gcc | |
| parent | a6124a42bc476740bfa03e928f007671baf0cba9 (diff) | |
| download | gcc-0b3ca5ee97993095632bea6f5586393583263cbf.zip gcc-0b3ca5ee97993095632bea6f5586393583263cbf.tar.gz gcc-0b3ca5ee97993095632bea6f5586393583263cbf.tar.bz2 | |
except.c (expand_end_catch_block): Lose call to __sjpopnthrow.
* except.c (expand_end_catch_block): Lose call to __sjpopnthrow.
Fixes sjlj failures.
From-SVN: r16435
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/except.c | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 45e8393..0eb150a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -4,6 +4,10 @@ Sun Nov 9 01:29:55 1997 Jim Wilson (wilson@cygnus.com) * init.c (build_vec_delete_1): Delete build_block and add_block_current_level calls. +Tue Nov 11 12:02:12 1997 Jason Merrill <jason@yorick.cygnus.com> + + * except.c (expand_end_catch_block): Lose call to __sjpopnthrow. + Tue Nov 11 02:53:44 1997 Jason Merrill <jason@lasher.cygnus.com> * except.c (do_pop_exception): Return a value. diff --git a/gcc/cp/except.c b/gcc/cp/except.c index 66d208c..009de14 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -692,17 +692,7 @@ expand_end_catch_block () do_pending_stack_adjust (); start_sequence_for_rtl_expr (t); - if (exceptions_via_longjmp) - { - /* If we are doing setjmp/longjmp EH, we need to skip through - the EH object cleanup region. This isn't quite right, as we - really need to clean the object up, but we cannot do that - until we track multiple EH objects. */ - - emit_library_call (sjpopnthrow_libfunc, 0, VOIDmode, 0); - emit_barrier (); - } - else + if (! exceptions_via_longjmp) { /* If we are not doing setjmp/longjmp EH, we need an extra region around the whole catch block to skip through the |