Changeset 8840228

Timestamp:

Apr 26, 2021, 6:54:39 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

ef3ac46

Parents:

24711a3 (diff), 5456537 (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) (2 diffs)
• concurrency/coroutine.hfa (modified) (2 diffs)
• concurrency/thread.cfa (modified) (2 diffs)
• concurrency/thread.hfa (modified) (2 diffs)
• exception.hfa (modified) (1 diff)

libcfa/src/concurrency/coroutine.cfa

@@ -61 +61 @@
 forall(T & | is_coroutine(T))
 void __cfaehm_cancelled_coroutine(
-                T & cor, $coroutine * desc, _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable ) {
+                T & cor, $coroutine * desc, EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)) ) {
         verify( desc->cancellation );
         desc->state = Cancelled;
@@ -145 +145 @@
 // Part of the Public API
 // Not inline since only ever called once per coroutine
-forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
+forall(T & | is_coroutine(T) | { EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)); })
 void prime(T& cor) {
         $coroutine* this = get_coroutine(cor);

libcfa/src/concurrency/coroutine.hfa

@@ -60 +60 @@
 //-----------------------------------------------------------------------------
 // Public coroutine API
-forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
+forall(T & | is_coroutine(T) | { EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)); })
 void prime(T & cor);
 
@@ -131 +131 @@
 forall(T & | is_coroutine(T))
 void __cfaehm_cancelled_coroutine(
-        T & cor, $coroutine * desc, _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable );
+        T & cor, $coroutine * desc, EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)) );
 
 // Resume implementation inlined for performance
-forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
+forall(T & | is_coroutine(T) | { EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)); })
 static inline T & resume(T & cor) {
         // optimization : read TLS once and reuse it

libcfa/src/concurrency/thread.cfa

@@ -80 +80 @@
 
 forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
-    | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
 void ?{}( thread_dtor_guard_t & this,
                 T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
@@ -159 +159 @@
 //-----------------------------------------------------------------------------
 forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
-    | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
 T & join( T & this ) {
         thread_dtor_guard_t guard = { this, defaultResumptionHandler };

libcfa/src/concurrency/thread.hfa

@@ -80 +80 @@
 
 forall( T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
-    | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; } )
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
 void ?{}( thread_dtor_guard_t & this, T & thrd, void(*)(ThreadCancelled(T) &) );
 void ^?{}( thread_dtor_guard_t & this );
@@ -127 +127 @@
 // join
 forall( T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
-    | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; } )
+    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
 T & join( T & this );
 

libcfa/src/exception.hfa

@@ -64 +64 @@
         _EHM_VIRTUAL_TABLE(exception_name, arguments, table_name)
 
-#define EHM_TYPE_ID(exception_name) _EHM_TYPE_ID_TYPE(exception_name)
-
-#define EHM_MATCH_ALL __cfa__parent_vtable
+// EHM_DEFAULT_VTABLE(exception_name, (arguments))
+// Create a declaration for a (possibly polymorphic) default vtable.
+#define EHM_DEFAULT_VTABLE(exception_name, arguments) \
+        _EHM_VTABLE_TYPE(exception_name) arguments & const _default_vtable
 
 // IS_EXCEPTION(exception_name [, (...parameters)])