Changeset 578c09a for libcfa/src

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

Location:

libcfa/src

Files:

• concurrency/coroutine.cfa (modified) (4 diffs)
• concurrency/coroutine.hfa (modified) (5 diffs)
• exception.hfa (modified) (1 diff)

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);

libcfa/src/concurrency/coroutine.hfa

@@ -22 +22 @@
 //-----------------------------------------------------------------------------
 // Exception thrown from resume when a coroutine stack is cancelled.
-EHM_EXCEPTION(SomeCoroutineCancelled)(
-        void * the_coroutine;
-        exception_t * the_exception;
-);
-
-EHM_EXTERN_VTABLE(SomeCoroutineCancelled, std_coroutine_cancelled);
-
 EHM_FORALL_EXCEPTION(CoroutineCancelled, (coroutine_t &), (coroutine_t)) (
         coroutine_t * the_coroutine;
@@ -44 +37 @@
 // Anything that implements this trait can be resumed.
 // Anything that is resumed is a coroutine.
-trait is_coroutine(T & | IS_RESUMPTION_EXCEPTION(SomeCoroutineCancelled)) {
+trait is_coroutine(T & | IS_RESUMPTION_EXCEPTION(CoroutineCancelled, (T))) {
         void main(T & this);
         $coroutine * get_coroutine(T & this);
@@ -67 +60 @@
 //-----------------------------------------------------------------------------
 // Public coroutine API
-forall(T & | is_coroutine(T))
+forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
 void prime(T & cor);
 
@@ -137 +130 @@
 
 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 );
 
 // Resume implementation inlined for performance
-forall(T & | is_coroutine(T))
+forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
 static inline T & resume(T & cor) {
         // optimization : read TLS once and reuse it
@@ -170 +164 @@
         $ctx_switch( src, dst );
         if ( unlikely(dst->cancellation) ) {
-                __cfaehm_cancelled_coroutine( cor, dst );
+                __cfaehm_cancelled_coroutine( cor, dst, _default_vtable );
         }
 

libcfa/src/exception.hfa

@@ -142 +142 @@
                 _EHM_VTABLE_TYPE(exception_name) parameters const &) {} \
 
-#define _EHM_TRAIT_FUNCTION2(exception_name, forall_clause, parameters) \
-        forall_clause _EHM_VTABLE_TYPE(exception_name) parameters const & \
-                        get_exception_vtable(exception_name parameters const & this)
-
 #define __EHM_TRAIT_FUNCTION(exception_name, forall_clause, parameters) \
         forall_clause inline _EHM_VTABLE_TYPE(exception_name) parameters const & \