Changeset fe63ae6 for tests/linking

Timestamp:

Apr 12, 2021, 5:16:45 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:

a1b9bc3

Parents:

56c8b86 (diff), 73f4d08 (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:

tests/linking

Files:

• exception-nothreads.cfa (modified) (1 diff)
• exception-withthreads.cfa (modified) (1 diff)

tests/linking/exception-nothreads.cfa

@@ -17 +17 @@
 #include <exception.hfa>
 
-TRIVIAL_EXCEPTION(ping);
+EHM_EXCEPTION(ping)();
+EHM_VIRTUAL_TABLE(ping, ping_vt);
 
 int main(void) {
         try {
-                throwResume (ping){};
+                throwResume (ping){&ping_vt};
         } catchResume (ping *) {
                 printf("%s threads\n", threading_enabled() ? "with" : "no");

tests/linking/exception-withthreads.cfa

@@ -18 +18 @@
 #include "../exceptions/with-threads.hfa"
 
-TRIVIAL_EXCEPTION(ping);
+EHM_EXCEPTION(ping)();
+EHM_VIRTUAL_TABLE(ping, ping_vt);
 
 int main(void) {
         try {
-                throwResume (ping){};
+                throwResume (ping){&ping_vt};
         } catchResume (ping *) {
                 printf("%s threads\n", threading_enabled() ? "with" : "no");