Changes in libcfa/src/exception.c [cb20dcd:f1b6671]

File:

• libcfa/src/exception.c (modified) (6 diffs)

libcfa/src/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Apr  9 12:20:00 2020
-// Update Count     : 17
+// Last Modified On : Mon Apr 06 14:40:00 2020
+// Update Count     : 15
 //
 
@@ -28 +28 @@
 #include <unwind.h>
 #include <bits/debug.hfa>
-#include "stdhdr/assert.h"
 
 // FIX ME: temporary hack to keep ARM build working
@@ -217 +216 @@
                 struct _Unwind_Context * unwind_context,
                 void * stop_param) {
-        // Verify actions follow the rules we expect.
-        verify((actions & _UA_CLEANUP_PHASE) && actions & (_UA_FORCE_UNWIND));
-        verify(!(actions & (_UA_SEARCH_PHASE | _UA_HANDER_FRAME)));
-
-        if ( actions & _UA_END_OF_STACK ) {
-                exit(1);
-        } else {
-                return _URC_NO_REASON;
-        }
+        if ( actions & _UA_END_OF_STACK  ) exit(1);
+        if ( actions & _UA_CLEANUP_PHASE ) return _URC_NO_REASON;
+
+        return _URC_FATAL_PHASE2_ERROR;
 }
 
@@ -288 +282 @@
                         version, actions, exception_class, unwind_exception, unwind_context);
 
-        // Verify that actions follow the rules we expect.
-        // This function should never be called at the end of the stack.
-        verify(!(actions & _UA_END_OF_STACK));
-        // Either only the search phase flag is set or...
+        // If we've reached the end of the stack then there is nothing much we can do...
+        if (actions & _UA_END_OF_STACK) return _URC_END_OF_STACK;
+
         if (actions & _UA_SEARCH_PHASE) {
-                verify(actions == _UA_SEARCH_PHASE);
                 __cfaabi_dbg_print_safe(" lookup phase");
-        // ... we are in clean-up phase.
-        } else {
-                verify(actions & _UA_CLEANUP_PHASE);
+        }
+        else if (actions & _UA_CLEANUP_PHASE) {
                 __cfaabi_dbg_print_safe(" cleanup phase");
-                // We shouldn't be the handler frame during forced unwind.
-                if (actions & _UA_HANDLER_FRAME) {
-                        verify(!(actions & _UA_FORCE_UNWIND));
-                        __cfaabi_dbg_print_safe(" (handler frame)");
-                } else if (actions & _UA_FORCE_UNWIND) {
-                        __cfaabi_dbg_print_safe(" (force unwind)");
-                }
+        }
+        // Just in case, probably can't actually happen
+        else {
+                printf(" error\n");
+                return _URC_FATAL_PHASE1_ERROR;
         }
 
@@ -407 +396 @@
                         // This is only a cleanup handler, ignore it
                         __cfaabi_dbg_print_safe(" no action");
-                } else {
+                } else if (actions & _UA_CLEANUP_PHASE) {
                         // In clean-up phase, no destructors here but this could be the handler.
 
@@ -445 +434 @@
 
 #pragma GCC push_options
-#pragma GCC optimize("no-toplevel-reorder")
+#pragma GCC optimize("O0")
 
 // Try statements are hoisted out see comments for details. While this could probably be unique