Changeset 8e4bc30 for libcfa/src/concurrency/coroutine.cfa

Timestamp:

Oct 8, 2020, 12:45:43 PM (5 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:

8fc9a5f, baee756

Parents:

391c065 (diff), 6fbe9a5 (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/coroutine.cfa (modified) (3 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -47 +47 @@
 
 //-----------------------------------------------------------------------------
-FORALL_DATA_INSTANCE(CoroutineCancelled,
-                (dtype coroutine_t | sized(coroutine_t)), (coroutine_t))
+FORALL_DATA_INSTANCE(CoroutineCancelled, (dtype coroutine_t), (coroutine_t))
 
 struct __cfaehm_node {
@@ -59 +58 @@
 void mark_exception(CoroutineCancelled(T) *) {}
 
-forall(dtype T | sized(T))
+forall(dtype T)
 void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src) {
         dst->the_coroutine = src->the_coroutine;
@@ -77 +76 @@
         exception_t * except = (exception_t *)(1 + (__cfaehm_node *)desc->cancellation);
 
+        // TODO: Remove explitate vtable set once trac#186 is fixed.
         CoroutineCancelled(T) except;
+        except.virtual_table = &get_exception_vtable(&except);
         except.the_coroutine = &cor;
         except.the_exception = except;