Changeset 7d6e01d for libcfa/src/exception.hfa

Timestamp:

May 19, 2020, 2:51:23 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

046a890, d47349b

Parents:

068a202 (diff), 7c38d53 (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.hfa (modified) (3 diffs)

libcfa/src/exception.hfa

@@ -10 +10 @@
 // Created On       : Thu Apr  7 10:25:00 2020
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Apr  7 10:25:00 2020
-// Update Count     : 0
+// Last Modified On : Wed Apr 13 15:42:00 2020
+// Update Count     : 1
 //
+
+trait is_exception(dtype T) {
+        // The trait system can't describe the actual constrants.
+        // Unused, should always be a no-op.
+        void mark_exception(T *);
+};
+
+forall(dtype T | is_exception(T))
+inline void cancel_stack(T & except) __attribute__((noreturn)) {
+        __cfaehm_cancel_stack( (exception_t *)&except );
+}
 
 // Everything below this line should be considered a patch while the exception
@@ -69 +80 @@
 #define _VTABLE_DECLARATION(exception_name, parent_name, ...) \
         struct exception_name; \
+        void mark_exception(exception_name *); \
         VTABLE_TYPE(exception_name); \
         extern VTABLE_TYPE(exception_name) VTABLE_NAME(exception_name); \
@@ -85 +97 @@
 #define VTABLE_INSTANCE(...) _EXC_DISPATCH(_VTABLE_INSTANCE, __VA_ARGS__)
 #define _VTABLE_INSTANCE(exception_name, parent_name, ...) \
+        void mark_exception(exception_name *) {} \
         void _GLUE2(exception_name,_copy)(exception_name * this, exception_name * other) { \
                 *this = *other; \