Changeset 1ce2189 for src/libcfa/exception.c

Timestamp:

Jul 5, 2017, 4:47:00 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0614d14, 208e5be, a5de33e, ff919a3

Parents:

8c97ee7 (diff), b72d4ed (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.

git-author:

Thierry Delisle <tdelisle@…> (07/05/17 16:43:21)

git-committer:

Thierry Delisle <tdelisle@…> (07/05/17 16:47:00)

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/libcfa/exception.c

@@ -37 +37 @@
 // This macro should be the only thing that needs to change across machines.
 // Used in the personality function, way down in termination.
-// struct _Unwind_Context * -> _Unwind_Reason_Code(*)()
+// struct _Unwind_Context * -> _Unwind_Reason_Code(*)(exception *)
 #define MATCHER_FROM_CONTEXT(ptr_to_context) \
-        (*(_Unwind_Reason_Code(**)())(_Unwind_GetCFA(ptr_to_context) + 8))
+        (*(_Unwind_Reason_Code(**)(exception*))(_Unwind_GetCFA(ptr_to_context) + 8))
 
 
@@ -261 +261 @@
                                         // _Unwind_Reason_Code (*matcher)() = (_Unwind_Reason_Code (*)())lsd_info.LPStart + imatcher;                                   
 
-                                        _Unwind_Reason_Code (*matcher)() =
+                                        _Unwind_Reason_Code (*matcher)(exception *) =
                                                 MATCHER_FROM_CONTEXT(context);
-                                        int index = matcher(shared_stack.current_exception);
+                                        int index = matcher(&shared_stack.current_exception);
                                         _Unwind_Reason_Code ret = (0 == index)
                                                 ? _URC_CONTINUE_UNWIND : _URC_HANDLER_FOUND;