Changeset 6437ce4

Timestamp:

Jul 6, 2020, 4:54:56 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

4d23dd2, b56f55c

Parents:

ac9ba12 (diff), 381132b (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

Files:

• libcfa/src/exception.c (modified) (1 diff)
• tests/exceptions/.expect/defaults.txt (modified) (1 diff)
• tests/exceptions/defaults.cfa (modified) (2 diffs)

libcfa/src/exception.c

@@ -85 +85 @@
         __cfadbg_print_safe(exception, "Throwing resumption exception\n");
 
-        __attribute__((cleanup(reset_top_resume)))
-        struct __cfaehm_try_resume_node * original_head = context->top_resume;
-        struct __cfaehm_try_resume_node * current = context->top_resume;
-
-        for ( ; current ; current = current->next) {
-                context->top_resume = current->next;
-                if (current->handler(except)) {
-                        return;
+        {
+                __attribute__((cleanup(reset_top_resume)))
+                struct __cfaehm_try_resume_node * original_head = context->top_resume;
+                struct __cfaehm_try_resume_node * current = context->top_resume;
+
+                for ( ; current ; current = current->next) {
+                        context->top_resume = current->next;
+                        if (current->handler(except)) {
+                                return;
+                        }
                 }
-        }
+        } // End the search and return to the top of the stack.
 
         // No handler found, fall back to the default operation.

tests/exceptions/.expect/defaults.txt

@@ -3 +3 @@
 jump default handler.
 Catch unhandled_exception.
+cross terminate throw
+cross terminate default
+cross terminate catch
+cross resume throw
+cross resume default
+cross resume catch

tests/exceptions/defaults.cfa

@@ -30 +30 @@
                 throwResume (log_message){(char *)"Should be printed.\n"};
         } catchResume (log_message * this) {
-                printf(this->virtual_table->msg(this));
+                printf("%s", this->virtual_table->msg(this));
         }
         // But we don't have to:
@@ -69 +69 @@
 }
 
+TRIVIAL_EXCEPTION(second);
+
+void cross_test(void) {
+        void defaultTerminationHandler(first &) {
+                printf("cross terminate default\n");
+                throw (second){};
+        }
+        void defaultResumptionHandler(first &) {
+                printf("cross resume default\n");
+                throwResume (second){};
+        }
+        try {
+                printf("cross terminate throw\n");
+                throw (first){};
+        } catch (second *) {
+                printf("cross terminate catch\n");
+        }
+        try {
+                printf("cross resume throw\n");
+                throwResume (first){};
+        } catchResume (second *) {
+                printf("cross resume catch\n");
+        }
+}
+
 int main(int argc, char * argv[]) {
         log_test();
         jump_test();
         unhandled_test();
+        cross_test();
 }