Skip to content

Commit

Permalink
cmd/compile: mark live heap-allocated pparamout vars as needzero
Browse files Browse the repository at this point in the history
If we don't mark them as needzero, we have a live pointer variable
containing possible garbage, which will baffle the GC.

Fixes #16249.

Change-Id: I7c423ceaca199ddd46fc2c23e5965e7973f07584
Reviewed-on: https://go-review.googlesource.com/24715
Run-TryBot: Ian Lance Taylor <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Keith Randall <[email protected]>
  • Loading branch information
ianlancetaylor committed Jul 2, 2016
1 parent 575a871 commit 519b469
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/cmd/compile/internal/gc/plive.go
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,7 @@ func livenessepilogue(lv *Liveness) {
if hasdefer {
for _, n := range lv.vars {
if n.IsOutputParamHeapAddr() {
n.Name.Needzero = true
xoffset := n.Xoffset + stkptrsize
onebitwalktype1(n.Type, &xoffset, ambig)
}
Expand Down
58 changes: 58 additions & 0 deletions test/fixedbugs/issue16249.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// run

// Copyright 2016 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.

// Liveness calculations were wrong for a result parameter pushed onto
// the heap in a function that used defer. Program would crash with
// runtime: bad pointer in frame main.A at 0xc4201e6838: 0x1

package main

import "errors"

var sink interface{}

//go:noinline
func f(err *error) {
if err != nil {
sink = err
}
}

//go:noinline
func A(n, m int64) (res int64, err error) {
defer f(&err) // output parameter's address escapes to a defer.
if n < 0 {
err = errors.New("No negative")
return
}
if n <= 1 {
res = n
return
}
res = B(m) // This call to B drizzles a little junk on the stack.
res, err = A(n-1, m)
res++
return
}

// B does a little bit of recursion dribbling not-zero onto the stack.
//go:noinline
func B(n int64) (res int64) {
if n <= 1 { // Prefer to leave a 1 on the stack.
return n
}
return 1 + B(n-1)
}

func main() {
x, e := A(0, 0)
for j := 0; j < 4; j++ { // j controls amount of B's stack dribble
for i := 0; i < 1000; i++ { // try more and more recursion until stack growth occurs in newobject in prologue
x, e = A(int64(i), int64(j))
}
}
_, _ = x, e
}

0 comments on commit 519b469

Please sign in to comment.