Changeset 578c09a for libcfa/src/concurrency/coroutine.cfa

Timestamp:

Apr 23, 2021, 11:53:33 AM (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:

aaf92de

Parents:

b39e6566 (diff), b583113 (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) (4 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -46 +46 @@
 
 //-----------------------------------------------------------------------------
-EHM_VIRTUAL_TABLE(SomeCoroutineCancelled, std_coroutine_cancelled);
-
 forall(T &)
 void copy(CoroutineCancelled(T) * dst, CoroutineCancelled(T) * src) {
@@ -62 +60 @@
 // This code should not be inlined. It is the error path on resume.
 forall(T & | is_coroutine(T))
-void __cfaehm_cancelled_coroutine( T & cor, $coroutine * desc ) {
+void __cfaehm_cancelled_coroutine(
+                T & cor, $coroutine * desc, _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable ) {
         verify( desc->cancellation );
         desc->state = Cancelled;
@@ -68 +67 @@
 
         // TODO: Remove explitate vtable set once trac#186 is fixed.
-        SomeCoroutineCancelled except;
-        except.virtual_table = &std_coroutine_cancelled;
+        CoroutineCancelled(T) except;
+        except.virtual_table = &_default_vtable;
         except.the_coroutine = &cor;
         except.the_exception = except;
         // Why does this need a cast?
-        throwResume (SomeCoroutineCancelled &)except;
+        throwResume (CoroutineCancelled(T) &)except;
 
         except->virtual_table->free( except );
@@ -146 +145 @@
 // Part of the Public API
 // Not inline since only ever called once per coroutine
-forall(T & | is_coroutine(T))
+forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
 void prime(T& cor) {
         $coroutine* this = get_coroutine(cor);