From a368532c2cc3c92369401c77e1613fcb37f91ee4 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 12 Nov 1997 03:54:47 +0000 Subject: [PATCH] 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: r16434 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/except.c | 12 +----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ae36caa432e1..6a56778d92c8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +Tue Nov 11 12:02:12 1997 Jason Merrill + + * except.c (expand_end_catch_block): Lose call to __sjpopnthrow. + Tue Nov 11 02:53:44 1997 Jason Merrill * except.c (do_pop_exception): Return a value. diff --git a/gcc/cp/except.c b/gcc/cp/except.c index 66d208c08ce1..009de14a548f 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 -- 2.47.2