Changeset 8ad5752 for libcfa/src/exception.c

Timestamp:

May 21, 2020, 12:22:33 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

66ba544

Parents:

918b90c

Message:

Added tests for default exception handlers. Fixed a memory leak they revealed.

File:

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

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue May 19 14:17:00 2020
-// Update Count     : 19
+// Last Modified On : Thr May 21 12:18:00 2020
+// Update Count     : 20
 //
 
@@ -237 +237 @@
 }
 
+static void __cfaehm_cleanup_default( exception_t ** except ) {
+        __cfaehm_delete_exception( *except );
+        *except = NULL;
+}
+
 // The exception that is being thrown must already be stored.
 static void __cfaehm_begin_unwind(void(*defaultHandler)(exception_t *)) {
-        if ( ! this_exception_context()->current_exception ) {
+        struct exception_context_t * context = this_exception_context();
+        struct _Unwind_Exception * storage = &this_exception_storage;
+        if ( NULL == context->current_exception ) {
                 printf("UNWIND ERROR missing exception in begin unwind\n");
                 abort();
@@ -245 +252 @@
 
         // Call stdlibc to raise the exception
-        _Unwind_Reason_Code ret = _Unwind_RaiseException( &this_exception_storage );
+        __cfadbg_print_safe(exception, "Begin unwinding (storage &p, context %p)\n", storage, context);
+        _Unwind_Reason_Code ret = _Unwind_RaiseException( storage );
 
         // If we reach here it means something happened. For resumption to work we need to find a way
@@ -254 +262 @@
         // the whole stack.
 
+        // We did not simply reach the end of the stack without finding a handler. This is an error.
+        if ( ret != _URC_END_OF_STACK ) {
+                printf("UNWIND ERROR %d after raise exception\n", ret);
+                abort();
+        }
+
         // No handler found, go to the default operation.
-        if ( ret == _URC_END_OF_STACK ) {
-                __cfadbg_print_safe(exception, "Uncaught exception %p\n", &this_exception_storage);
-
-                defaultHandler( this_exception_context()->current_exception );
-        }
-
-        // We did not simply reach the end of the stack without finding a handler. This is an error.
-        printf("UNWIND ERROR %d after raise exception\n", ret);
-        abort();
+        __cfadbg_print_safe(exception, "Uncaught exception %p\n", storage);
+
+        __attribute__((cleanup(__cfaehm_cleanup_default)))
+        exception_t * exception = context->current_exception;
+        defaultHandler( exception );
 }