1
0
mirror of https://github.com/golang/go synced 2024-11-26 04:37:59 -07:00

undo CL 8954044 / ad3c2ffb16d7

It works on i386, but fails on amd64 and arm.

««« original CL description
runtime: prevent the GC from seeing the content of a frame in runfinq()

Fixes #5348.

R=golang-dev, dvyukov
CC=golang-dev
https://golang.org/cl/8954044
»»»

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/8695051
This commit is contained in:
Jan Ziak 2013-04-25 18:12:09 +02:00
parent e9bbe3a8da
commit db1c218d4f
2 changed files with 1 additions and 38 deletions

View File

@ -2191,7 +2191,7 @@ runfinq(void)
framesz = sizeof(uintptr) + f->nret;
if(framecap < framesz) {
runtime·free(frame);
frame = runtime·mallocgc(framesz, FlagNoPointers, 0, 1);
frame = runtime·mal(framesz);
framecap = framesz;
}
*(void**)frame = f->arg;

View File

@ -1,37 +0,0 @@
// 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.
// Issue 5348: finalizers keep data live for a surprising amount of time
package main
import (
"runtime"
)
type T struct {
S *string
}
func newString(s string) *string {
return &s
}
var c = make(chan int)
func foo() {
t := &T{S: newString("foo")}
runtime.SetFinalizer(t, func(p *T) { c <- 0 })
runtime.SetFinalizer(t.S, func(p *string) { c <- 0 })
}
func main() {
foo()
runtime.GC()
<-c
runtime.GC()
<-c
}