diff options
| author | Dmitriy Vyukov <dvyukov@google.com> | 2014-03-07 20:52:29 +0400 |
|---|---|---|
| committer | Dmitriy Vyukov <dvyukov@google.com> | 2014-03-07 20:52:29 +0400 |
| commit | 1a89e6388c3f1994da17a1d91a45920663db2af5 (patch) | |
| tree | b17c5bed1b1bee0e888c4f1e803019a22960c4a2 /src/pkg/runtime/panic.c | |
| parent | f946a7ca0971027a71e057c2650fdf63d54543e8 (diff) | |
| download | go-1a89e6388c3f1994da17a1d91a45920663db2af5.tar.xz | |
runtime: refactor and fix stack management code
There are at least 3 bugs:
1. g->stacksize accounting is broken during copystack/shrinkstack
2. stktop->free is not properly maintained during copystack/shrinkstack
3. stktop->free logic is broken:
we can have stktop->free==FixedStack,
and we will free it into stack cache,
but it actually comes from heap as the result of non-copying segment shrink
This shows as at least spurious races on race builders (maybe something else as well I don't know).
The idea behind the refactoring is to consolidate stacksize and
segment origin logic in stackalloc/stackfree.
Fixes #7490.
LGTM=rsc, khr
R=golang-codereviews, rsc, khr
CC=golang-codereviews
https://golang.org/cl/72440043
Diffstat (limited to 'src/pkg/runtime/panic.c')
| -rw-r--r-- | src/pkg/runtime/panic.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/pkg/runtime/panic.c b/src/pkg/runtime/panic.c index a580e9f310..29bf7de27f 100644 --- a/src/pkg/runtime/panic.c +++ b/src/pkg/runtime/panic.c @@ -339,10 +339,7 @@ runtime·unwindstack(G *gp, byte *sp) gp->stackbase = top->stackbase; gp->stackguard = top->stackguard; gp->stackguard0 = gp->stackguard; - if(top->free != 0) { - gp->stacksize -= top->free; - runtime·stackfree(stk, top->free); - } + runtime·stackfree(gp, stk, top); } if(sp != nil && (sp < (byte*)gp->stackguard - StackGuard || (byte*)gp->stackbase < sp)) { |