diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-30 05:16:36 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-30 05:16:36 +0000 |
| commit | bc4381667a31bd5f1e677d64c789b1e959df00d5 (patch) | |
| tree | a6b80dca8f72a2e7640e4d535901e42325b2a954 /libgo/runtime/go-unwind.c | |
| parent | 1cd66bce1663eb648638d311b493de0dcc4146c3 (diff) | |
| parent | 738c50b853f5ba0eaf93e23f6d29cbac761eef9e (diff) | |
| download | gcc-reload-v2a.tar.gz | |
Weekly merge from trunk. No regressions.reload-v2a
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/reload-v2a@181834 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/runtime/go-unwind.c')
| -rw-r--r-- | libgo/runtime/go-unwind.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libgo/runtime/go-unwind.c b/libgo/runtime/go-unwind.c index 58c675a2dc8..c669a3ce889 100644 --- a/libgo/runtime/go-unwind.c +++ b/libgo/runtime/go-unwind.c @@ -47,8 +47,11 @@ static const _Unwind_Exception_Class __go_exception_class = void __go_check_defer (_Bool *frame) { + G *g; struct _Unwind_Exception *hdr; + g = runtime_g (); + if (g == NULL) { /* Some other language has thrown an exception. We know there @@ -164,7 +167,7 @@ __go_unwind_stack () sizeof hdr->exception_class); hdr->exception_cleanup = NULL; - g->exception = hdr; + runtime_g ()->exception = hdr; #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException (hdr); @@ -280,6 +283,7 @@ PERSONALITY_FUNCTION (int version, _Unwind_Ptr landing_pad, ip; int ip_before_insn = 0; _Bool is_foreign; + G *g; #ifdef __ARM_EABI_UNWINDER__ _Unwind_Action actions; @@ -416,6 +420,7 @@ PERSONALITY_FUNCTION (int version, /* It's possible for g to be NULL here for an exception thrown by a language other than Go. */ + g = runtime_g (); if (g == NULL) { if (!is_foreign) |