mirror of
https://github.com/golang/go
synced 2024-09-04 23:44:16 +00:00
cmd/gc: treat non-local vars inlined into wrapper as escaping
The compiler has a phase ordering problem. Escape analysis runs before wrapper generation. When a generated wrapper calls a method defined in a different package, if that call is inlined, there will be no escape information for the variables defined in the inlined call. Those variables will be placed on the stack, which fails if they actually do escape. There are probably various complex ways to fix this. This is a simple way to avoid it: when a generated wrapper calls a method defined in a different package, treat all local variables as escaping. Fixes #9537. Change-Id: I530f39346de16ad173371c6c3f69cc189351a4e9 Reviewed-on: https://go-review.googlesource.com/3092 Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
parent
98d914201b
commit
ec0ebc2281
|
@ -982,6 +982,7 @@ EXTERN int funcdepth;
|
|||
EXTERN int typecheckok;
|
||||
EXTERN int compiling_runtime;
|
||||
EXTERN int compiling_wrappers;
|
||||
EXTERN int inl_nonlocal;
|
||||
EXTERN int use_writebarrier;
|
||||
EXTERN int pure_go;
|
||||
EXTERN char* flag_installsuffix;
|
||||
|
|
|
@ -804,9 +804,12 @@ inlvar(Node *var)
|
|||
n->curfn = curfn; // the calling function, not the called one
|
||||
n->addrtaken = var->addrtaken;
|
||||
|
||||
// esc pass wont run if we're inlining into a iface wrapper
|
||||
// luckily, we can steal the results from the target func
|
||||
if(var->esc == EscHeap)
|
||||
// Esc pass wont run if we're inlining into a iface wrapper.
|
||||
// Luckily, we can steal the results from the target func.
|
||||
// If inlining a function defined in another package after
|
||||
// escape analysis is done, treat all local vars as escaping.
|
||||
// See issue 9537.
|
||||
if(var->esc == EscHeap || (inl_nonlocal && var->op == ONAME))
|
||||
addrescapes(n);
|
||||
|
||||
curfn->dcl = list(curfn->dcl, n);
|
||||
|
|
|
@ -2617,7 +2617,16 @@ genwrapper(Type *rcvr, Type *method, Sym *newnam, int iface)
|
|||
fn->dupok = 1;
|
||||
typecheck(&fn, Etop);
|
||||
typechecklist(fn->nbody, Etop);
|
||||
|
||||
// Set inl_nonlocal to whether we are calling a method on a
|
||||
// type defined in a different package. Checked in inlvar.
|
||||
if(!methodrcvr->local)
|
||||
inl_nonlocal = 1;
|
||||
|
||||
inlcalls(fn);
|
||||
|
||||
inl_nonlocal = 0;
|
||||
|
||||
curfn = nil;
|
||||
funccompile(fn, 0);
|
||||
}
|
||||
|
|
25
test/fixedbugs/issue9537.dir/a.go
Normal file
25
test/fixedbugs/issue9537.dir/a.go
Normal file
|
@ -0,0 +1,25 @@
|
|||
// Copyright 2015 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 a
|
||||
|
||||
type X struct {
|
||||
T [32]byte
|
||||
}
|
||||
|
||||
func (x *X) Get() []byte {
|
||||
t := x.T
|
||||
return t[:]
|
||||
}
|
||||
|
||||
func (x *X) RetPtr(i int) *int {
|
||||
i++
|
||||
return &i
|
||||
}
|
||||
|
||||
func (x *X) RetRPtr(i int) (r1 int, r2 *int) {
|
||||
r1 = i + 1
|
||||
r2 = &r1
|
||||
return
|
||||
}
|
43
test/fixedbugs/issue9537.dir/b.go
Normal file
43
test/fixedbugs/issue9537.dir/b.go
Normal file
|
@ -0,0 +1,43 @@
|
|||
// Copyright 2015 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 (
|
||||
"bytes"
|
||||
|
||||
"./a"
|
||||
)
|
||||
|
||||
type X struct {
|
||||
*a.X
|
||||
}
|
||||
|
||||
type Intf interface {
|
||||
Get() []byte
|
||||
RetPtr(int) *int
|
||||
RetRPtr(int) (int, *int)
|
||||
}
|
||||
|
||||
func main() {
|
||||
x := &a.X{T: [32]byte{1, 2, 3, 4}}
|
||||
var ix Intf = X{x}
|
||||
t1 := ix.Get()
|
||||
t2 := x.Get()
|
||||
if !bytes.Equal(t1, t2) {
|
||||
panic(t1)
|
||||
}
|
||||
|
||||
p1 := ix.RetPtr(5)
|
||||
p2 := x.RetPtr(7)
|
||||
if *p1 != 6 || *p2 != 8 {
|
||||
panic(*p1)
|
||||
}
|
||||
|
||||
r1, r2 := ix.RetRPtr(10)
|
||||
r3, r4 := x.RetRPtr(13)
|
||||
if r1 != 11 || *r2 != 11 || r3 != 14 || *r4 != 14 {
|
||||
panic("bad RetRPtr")
|
||||
}
|
||||
}
|
10
test/fixedbugs/issue9537.go
Normal file
10
test/fixedbugs/issue9537.go
Normal file
|
@ -0,0 +1,10 @@
|
|||
// rundir
|
||||
|
||||
// Copyright 2015 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 9537: Compiler does not run escape analysis on an inlined
|
||||
// generated method wrapper.
|
||||
|
||||
package ignored
|
Loading…
Reference in a new issue