Changeset 012cfc3

Timestamp:

Jun 16, 2021, 6:04:55 PM (3 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

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

Children:

d96becd

Parents:

32318de (diff), 95958a8 (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:

• exception.c (modified) (1 diff)
• stdhdr/pthread.h (added)

libcfa/src/exception.c

@@ -256 +256 @@
         // the whole stack.
 
+#if defined( __x86_64 ) || defined( __i386 )
         // We did not simply reach the end of the stack without finding a handler. This is an error.
         if ( ret != _URC_END_OF_STACK ) {
+#else // defined( __ARM_ARCH )
+        // The return code from _Unwind_RaiseException seems to be corrupt on ARM at end of stack.
+        // This workaround tries to keep default exception handling working. 
+        if ( ret == _URC_FATAL_PHASE1_ERROR || ret == _URC_FATAL_PHASE2_ERROR ) {
+#endif
                 printf("UNWIND ERROR %d after raise exception\n", ret);
                 abort();