Changes in libcfa/src/concurrency/coroutine.cfa [290553a:c960331]

File:

• libcfa/src/concurrency/coroutine.cfa (modified) (6 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -10 +10 @@
 // Created On       : Mon Nov 28 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 26 22:06:09 2020
-// Update Count     : 21
+// Last Modified On : Fri Oct 23 23:05:24 2020
+// Update Count     : 22
 //
 
@@ -24 +24 @@
 #include <unistd.h>
 #include <sys/mman.h>                                                                   // mprotect
-extern "C" {
-// use this define to make unwind.h play nice, definitely a hack
-#define HIDE_EXPORTS
 #include <unwind.h>
-#undef HIDE_EXPORTS
-}
 
 #include "kernel_private.hfa"
+#include "exception.hfa"
 
 #define __CFA_INVOKE_PRIVATE__
@@ -49 +45 @@
 FORALL_DATA_INSTANCE(CoroutineCancelled, (dtype coroutine_t), (coroutine_t))
 
-struct __cfaehm_node {
-        struct _Unwind_Exception unwind_exception;
-        struct __cfaehm_node * next;
-        int handler_index;
-};
-
 forall(dtype T)
 void mark_exception(CoroutineCancelled(T) *) {}
@@ -60 +50 @@
 forall(dtype T)
 void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src) {
+        dst->virtual_table = src->virtual_table;
         dst->the_coroutine = src->the_coroutine;
         dst->the_exception = src->the_exception;
@@ -74 +65 @@
         verify( desc->cancellation );
         desc->state = Cancelled;
-        exception_t * except = (exception_t *)(1 + (__cfaehm_node *)desc->cancellation);
+        exception_t * except = __cfaehm_cancellation_exception( desc->cancellation );
 
         // TODO: Remove explitate vtable set once trac#186 is fixed.
@@ -217 +208 @@
                 size = libFloor(create_size - stack_data_size - diff, libAlign());
         } // if
-        assertf( size >= MinStackSize, "Stack size %zd provides less than minimum of %d bytes for a stack.", size, MinStackSize );
+        assertf( size >= MinStackSize, "Stack size %zd provides less than minimum of %zd bytes for a stack.", size, MinStackSize );
 
         this->storage = (__stack_t *)((intptr_t)storage + size);