Changeset 13600e8 for libcfa/src/exception.c

Timestamp:

Aug 10, 2023, 10:24:06 PM (15 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

09a767e

Parents:

7839f78

Message:

fix error when exception propagation does not find a handler and print appropriate message

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 : Peter A. Buhr
-// Last Modified On : Thu Jul 27 09:45:57 2023
-// Update Count     : 37
+// Last Modified On : Thu Aug 10 16:45:22 2023
+// Update Count     : 69
 //
 
@@ -27 +27 @@
 #include "stdhdr/assert.h"
 #include "virtual.h"
+
+extern void __cabi_abort( const char fmt[], ... );
 
 #pragma GCC visibility push(default)
@@ -192 +194 @@
 
         if ( actions & _UA_END_OF_STACK ) {
-                abort();
+                __cabi_abort(
+                        "Propagation failed to find a matching handler.\n"
+                        "Possible cause is a missing try block with appropriate catch clause for specified exception type.\n"
+                        "Last exception name or message: %s.\n",
+                        NODE_TO_EXCEPT( UNWIND_TO_NODE( unwind_exception ) )->
+                                virtual_table->msg( NODE_TO_EXCEPT( UNWIND_TO_NODE( unwind_exception ) ) )
+                );
         } else {
                 return _URC_NO_REASON;
@@ -209 +217 @@
         struct exception_context_t * context = this_exception_context();
         struct __cfaehm_node * node = EXCEPT_TO_NODE(context->current_exception);
-
-        // Preform clean-up of any extra active exceptions.
-        while ( node->next ) {
-                struct __cfaehm_node * to_free = node->next;
-                node->next = to_free->next;
-                exception_t * except = NODE_TO_EXCEPT( to_free );
-                except->virtual_table->free( except );
-            free( to_free );
-        }
 
         _Unwind_Reason_Code ret;