Changeset 93068e53 for libcfa/src/concurrency/exception.hfa

Timestamp:

Oct 29, 2020, 4:13:27 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

7a2a3af, c6c682cf

Parents:

0b84b15 (diff), 936d95c (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/concurrency/exception.hfa (modified) (2 diffs)

libcfa/src/concurrency/exception.hfa

@@ -18 +18 @@
 // This is an internal bridge between the two modes and must be C compatable.
 
+#include <unwind.h>
 #include "bits/defs.hfa"
 #include "invoke.h"
+#include "exception.h"
 
 #ifdef __cforall
 extern "C" {
-
-#define HIDE_EXPORTS
 #endif
-#include "unwind.h"
 
 struct exception_context_t * this_exception_context(void) OPTIONAL_THREAD;
@@ -33 +32 @@
                 struct _Unwind_Exception * unwind_exception ) OPTIONAL_THREAD;
 
-struct __cfaehm_node {
-        struct _Unwind_Exception unwind_exception;
-        struct __cfaehm_node * next;
-        int handler_index;
-};
-
-static inline exception_t * __cfaehm_cancellation_exception(
-                struct _Unwind_Exception * unwind_exception ) {
-        return (exception_t *)(1 + (struct __cfaehm_node *)unwind_exception);
-}
-
 #ifdef __cforall
-#undef HIDE_EXPORTS
 }
 #endif