qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 00:40:08 -07:00
Code Releases Activity

cmd/compile: fix go:uintptrescapes tag for unnamed parameters

Browse Source 
The tag was overwritten by the code for special handling unnamed
parameters.

Fixes #23045.

Change-Id: Ie2e1db3e902a07a2bbbc2a3424cea300f0a42cc3
Reviewed-on: https://go-review.googlesource.com/82775
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Cherry Zhang 2017-12-07 22:01:42 -05:00
parent 91a6a2a30f
commit beeab6ac02
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/compile/internal/gc/esc.go
View File

@ -2260,6 +2260,13 @@ func (e *EscState) esctag(fn *Node) {
// (Unnamed parameters are not in the Dcl list in the loop above // (Unnamed parameters are not in the Dcl list in the loop above
// so we need to mark them separately.) // so we need to mark them separately.)
for _, f := range fn.Type.Params().Fields().Slice() { for _, f := range fn.Type.Params().Fields().Slice() {
if !types.Haspointers(f.Type) { // don't bother tagging for scalars
continue
}
if f.Note == uintptrEscapesTag {
// Note is already set in the loop above.
continue
}
if f.Sym == nil || f.Sym.IsBlank() { if f.Sym == nil || f.Sym.IsBlank() {
f.Note = mktag(EscNone) f.Note = mktag(EscNone)
} }

12
test/uintptrescapes2.go
View File

@ -20,12 +20,24 @@ func F1(a uintptr) {} // ERROR "escaping uintptr"
//go:noinline //go:noinline
func F2(a ...uintptr) {} // ERROR "escaping ...uintptr" "a does not escape" func F2(a ...uintptr) {} // ERROR "escaping ...uintptr" "a does not escape"
//go:uintptrescapes
//go:noinline
func F3(uintptr) {} // ERROR "escaping uintptr"
//go:uintptrescapes
//go:noinline
func F4(...uintptr) {} // ERROR "escaping ...uintptr"
func G() { func G() {
var t int // ERROR "moved to heap" var t int // ERROR "moved to heap"
F1(uintptr(unsafe.Pointer(&t))) // ERROR "live at call to F1: .?autotmp" "&t escapes to heap" F1(uintptr(unsafe.Pointer(&t))) // ERROR "live at call to F1: .?autotmp" "&t escapes to heap"
var t2 int // ERROR "moved to heap"
F3(uintptr(unsafe.Pointer(&t2))) // ERROR "live at call to F3: .?autotmp" "&t2 escapes to heap"
} }
func H() { func H() {
var v int // ERROR "moved to heap" var v int // ERROR "moved to heap"
F2(0, 1, uintptr(unsafe.Pointer(&v)), 2) // ERROR "live at call to newobject: .?autotmp" "live at call to F2: .?autotmp" "escapes to heap" F2(0, 1, uintptr(unsafe.Pointer(&v)), 2) // ERROR "live at call to newobject: .?autotmp" "live at call to F2: .?autotmp" "escapes to heap"
var v2 int // ERROR "moved to heap"
F4(0, 1, uintptr(unsafe.Pointer(&v2)), 2) // ERROR "live at call to newobject: .?autotmp" "live at call to F4: .?autotmp" "escapes to heap"
} }