Ignore:
Timestamp:
Apr 24, 2021, 11:32:49 AM (4 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:
424dfc4, 986cb99
Parents:
fec63b2 (diff), 8edbe40 (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/exceptions/cancel
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • tests/exceptions/cancel/coroutine.cfa

    rfec63b2 r50f6afb  
    2525                resume(cancel);
    2626                printf("4");
    27         } catchResume (SomeCoroutineCancelled * error) {
     27        } catchResume (CoroutineCancelled(WillCancel) * error) {
    2828                printf("2");
    2929                if ((virtual internal_error *)error->the_exception) {

  • tests/exceptions/cancel/thread.cfa

    rfec63b2 r50f6afb  
    2626                join(cancel);
    2727                printf("4");
    28         } catchResume (SomeThreadCancelled * error) {
     28        } catchResume (ThreadCancelled(WillCancel) * error) {
    2929                printf("2");
    3030                if ((virtual internal_error *)error->the_exception) {
    … …  
    4343                }
    4444                printf("4");
    45         } catchResume (SomeThreadCancelled * error) {
     45        } catchResume (ThreadCancelled(WillCancel) * error) {
    4646                printf("2");
    4747                if ((virtual internal_error *)error->the_exception) {
Note: See TracChangeset for help on using the changeset viewer.