summaryrefslogtreecommitdiff
path: root/gcc/unwind.inc
diff options
context:
space:
mode:
authordrow <drow@138bc75d-0d04-0410-961f-82ee72b054a4>2005-11-16 22:10:39 +0000
committerdrow <drow@138bc75d-0d04-0410-961f-82ee72b054a4>2005-11-16 22:10:39 +0000
commit3dd1860b1097091a5822260cf1698dd600554e87 (patch)
treeeee487b7c8a5cd39e5ffc9431300e3caa8c8935e /gcc/unwind.inc
parent3b975150186b30c6f78f6e0abbaec8c375c02e71 (diff)
downloadgcc-3dd1860b1097091a5822260cf1698dd600554e87.tar.gz
* config/ia64/unwind-ia64.c (uw_advance_context): New. Call
uw_update_context. * unwind-dw2.c (uw_advance_context): Likewise. * unwind-sjlj.c (uw_advance_context): Likewise. Also call _Unwind_SjLj_Unregister. * unwind.inc (_Unwind_ForcedUnwind_Phase2): Call uw_advance_context. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107103 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/unwind.inc')
-rw-r--r--gcc/unwind.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/unwind.inc b/gcc/unwind.inc
index 63fba968fa1..b533eb58873 100644
--- a/gcc/unwind.inc
+++ b/gcc/unwind.inc
@@ -184,8 +184,9 @@ _Unwind_ForcedUnwind_Phase2 (struct _Unwind_Exception *exc,
return _URC_FATAL_PHASE2_ERROR;
}
- /* Update cur_context to describe the same frame as fs. */
- uw_update_context (context, &fs);
+ /* Update cur_context to describe the same frame as fs, and discard
+ the previous context if necessary. */
+ uw_advance_context (context, &fs);
}
return code;