diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-06 22:37:27 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-06 22:37:27 +0000 |
| commit | 6736ef96eab222e58e6294f42be981a5afb59811 (patch) | |
| tree | 2bc668fae9bf96f9a3988e0b0a16685bde8c4f0b /libgo/runtime/go-unwind.c | |
| parent | 38a138411da4206c53f9a153ee9c3624fce58a52 (diff) | |
| download | gcc-6736ef96eab222e58e6294f42be981a5afb59811.zip gcc-6736ef96eab222e58e6294f42be981a5afb59811.tar.gz gcc-6736ef96eab222e58e6294f42be981a5afb59811.tar.bz2 | |
libgo: Merge to master revision 19184.
The next revision, 19185, renames several runtime files, and
will be handled in a separate change.
From-SVN: r211328
Diffstat (limited to 'libgo/runtime/go-unwind.c')
| -rw-r--r-- | libgo/runtime/go-unwind.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libgo/runtime/go-unwind.c b/libgo/runtime/go-unwind.c index 04b0a28..849256b 100644 --- a/libgo/runtime/go-unwind.c +++ b/libgo/runtime/go-unwind.c @@ -80,7 +80,6 @@ __go_check_defer (_Bool *frame) { struct __go_defer_stack *d; void (*pfn) (void *); - M *m; d = g->defer; if (d == NULL || d->__frame != frame || d->__pfn == NULL) @@ -91,9 +90,8 @@ __go_check_defer (_Bool *frame) (*pfn) (d->__arg); - m = runtime_m (); - if (m != NULL && m->mcache != NULL && d->__free) - __go_free (d); + if (runtime_m () != NULL) + runtime_freedefer (d); if (n->__was_recovered) { @@ -122,7 +120,6 @@ __go_check_defer (_Bool *frame) && g->defer->__frame == frame) { struct __go_defer_stack *d; - M *m; /* This is the defer function which called recover. Simply return to stop the stack unwind, and let the Go code continue @@ -130,9 +127,8 @@ __go_check_defer (_Bool *frame) d = g->defer; g->defer = d->__next; - m = runtime_m (); - if (m != NULL && m->mcache != NULL && d->__free) - __go_free (d); + if (runtime_m () != NULL) + runtime_freedefer (d); /* We are returning from this function. */ *frame = 1; |