From 43b3c4a7879e73ef370e696ee7531175857ae554 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 20 Dec 2011 18:56:14 -0800 Subject: Bug #35137 * unwind.c (uw_unwind_to_exit_point): When jumping to a catch frame, do not mark it invisible. * unwind.h (uw_catch): Flip the matches to nil so that this catch frame can no longer be identified as an unwind point by uw_throw, and thus will not be re-entered for the purposes of handling an exception. It remains visible for the purposes of running the clean up code. (uw_unwind): Prior to executing cleanup forms, flip the visibility to 0. This means that the frame will no longer be re-entered for any reason. --- unwind.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'unwind.c') diff --git a/unwind.c b/unwind.c index 7abd4e97..03ae0104 100644 --- a/unwind.c +++ b/unwind.c @@ -65,11 +65,6 @@ static void uw_unwind_to_exit_point(void) uw_stack->ca.sym = nil; uw_stack->ca.exception = nil; uw_stack->ca.cont = uw_exit_point; - /* This catch frame is no longer - visible. If the unwind section - throws something, it cannot - be caught in the same frame. */ - uw_stack->ca.visible = 0; /* 1 means unwind only. */ longjmp(uw_stack->ca.jb, 1); abort(); @@ -94,10 +89,6 @@ static void uw_unwind_to_exit_point(void) case UW_ENV: /* env frame cannot be exit point */ abort(); case UW_CATCH: - /* Catch frame is no longer visible. - If a catch or unwind throw something, - it cannot go back to the same catch. */ - uw_stack->ca.visible = 0; /* 2 means actual catch, not just unwind */ longjmp(uw_stack->ca.jb, 2); default: -- cgit v1.2.3