Skip to content

Commit

Permalink
runtime: zeroize g->fnstart to not prevent GC of the closure
Browse files Browse the repository at this point in the history
Fixes #5493.

R=golang-dev, minux.ma, iant
CC=golang-dev
https://golang.org/cl/9557043
  • Loading branch information
dvyukov committed May 20, 2013
1 parent d4cbc80 commit 1308194
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/pkg/runtime/proc.c
Expand Up @@ -1232,6 +1232,7 @@ static void
goexit0(G *gp)
{
gp->status = Gdead;
gp->fnstart = nil;
gp->m = nil;
gp->lockedm = nil;
m->curg = nil;
Expand Down
52 changes: 52 additions & 0 deletions test/fixedbugs/issue5493.go
@@ -0,0 +1,52 @@
// run

// Copyright 2013 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
"runtime"
"sync"
"sync/atomic"
"time"
)

const N = 10
var count int64

func run() error {
f1 := func() {}
f2 := func() {
func() {
f1()
}()
}
runtime.SetFinalizer(&f1, func(f *func()) {
atomic.AddInt64(&count, -1)
})
go f2()
return nil
}

func main() {
count = N
var wg sync.WaitGroup
wg.Add(N)
for i := 0; i < N; i++ {
go func() {
run()
wg.Done()
}()
}
wg.Wait()
for i := 0; i < 2*N; i++ {
time.Sleep(10 * time.Millisecond)
runtime.GC()
}
if count != 0 {
panic("not all finalizers are called")
}
}

0 comments on commit 1308194

Please sign in to comment.