Changeset e276be6 for libcfa/src/exception.c

Timestamp:

Apr 6, 2020, 8:50:45 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9d5d01f

Parents:

23ecea4 (diff), f1b6671 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/exception.c (modified) (5 diffs)

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Apr 03 11:57:00 2020
-// Update Count     : 14
+// Last Modified On : Mon Apr 06 14:40:00 2020
+// Update Count     : 15
 //
 
@@ -75 +75 @@
 // RESUMPTION ================================================================
 
+static void reset_top_resume(struct __cfaehm_try_resume_node ** store) {
+        this_exception_context()->top_resume = *store;
+}
+
 void __cfaehm_throw_resume(exception_t * except) {
         struct exception_context_t * context = this_exception_context();
@@ -80 +84 @@
         __cfaabi_dbg_print_safe("Throwing resumption exception\n");
 
+        __attribute__((cleanup(reset_top_resume)))
         struct __cfaehm_try_resume_node * original_head = context->top_resume;
         struct __cfaehm_try_resume_node * current = context->top_resume;
@@ -86 +91 @@
                 context->top_resume = current->next;
                 if (current->handler(except)) {
-                        context->top_resume = original_head;
                         return;
                 }
@@ -92 +96 @@
 
         __cfaabi_dbg_print_safe("Unhandled exception\n");
-        context->top_resume = original_head;
 
         // Fall back to termination: