summaryrefslogtreecommitdiff
path: root/test/escape_closure.go
diff options
context:
space:
mode:
authorMatthew Dempsky <mdempsky@google.com>2019-04-01 11:58:33 -0700
committerMatthew Dempsky <mdempsky@google.com>2019-04-02 16:34:03 +0000
commitabefcac10a635c5c6afdeada810f4663e6cb6f17 (patch)
tree1361a49965e3c1d19795abfc1734d3b262455ee8 /test/escape_closure.go
parent4ebc6514faa8530d1a68b4e04f57dc5c25bcb01c (diff)
downloadgo-git-abefcac10a635c5c6afdeada810f4663e6cb6f17.tar.gz
cmd/compile: skip escape analysis diagnostics for OADDR
For most nodes (e.g., OPTRLIT, OMAKESLICE, OCONVIFACE), escape analysis prints "escapes to heap" or "does not escape" to indicate whether that node's allocation can be heap or stack allocated. These messages are also emitted for OADDR, even though OADDR does not actually allocate anything itself. Moreover, it's redundant because escape analysis already prints "moved to heap" diagnostics when an OADDR node like "&x" causes x to require heap allocation. Because OADDR nodes don't allocate memory, my escape analysis rewrite doesn't naturally emit the "escapes to heap" / "does not escape" diagnostics for them. It's also non-trivial to replicate the exact semantics esc.go uses for OADDR. Since there are so many of these messages, I'm disabling them in this CL by themselves. I modified esc.go to suppress the Warnl calls without any other behavior changes, and then used a shell script to automatically remove any ERROR messages mentioned by run.go in "missing error" or "no match for" lines. Fixes #16300. Updates #23109. Change-Id: I3993e2743c3ff83ccd0893f4e73b366ff8871a57 Reviewed-on: https://go-review.googlesource.com/c/go/+/170319 Run-TryBot: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Cherry Zhang <cherryyz@google.com> Reviewed-by: David Chase <drchase@google.com>
Diffstat (limited to 'test/escape_closure.go')
-rw-r--r--test/escape_closure.go36
1 files changed, 18 insertions, 18 deletions
diff --git a/test/escape_closure.go b/test/escape_closure.go
index fc35cb59cf..93efe94ed7 100644
--- a/test/escape_closure.go
+++ b/test/escape_closure.go
@@ -15,7 +15,7 @@ func ClosureCallArgs0() {
func(p *int) { // ERROR "p does not escape" "func literal does not escape"
*p = 1
// BAD: x should not escape to heap here
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs1() {
@@ -24,7 +24,7 @@ func ClosureCallArgs1() {
func(p *int) { // ERROR "p does not escape" "func literal does not escape"
*p = 1
// BAD: x should not escape to heap here
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
}
@@ -34,7 +34,7 @@ func ClosureCallArgs2() {
x := 0 // ERROR "moved to heap: x"
func(p *int) { // ERROR "p does not escape" "func literal does not escape"
*p = 1
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
}
@@ -42,7 +42,7 @@ func ClosureCallArgs3() {
x := 0 // ERROR "moved to heap: x"
func(p *int) { // ERROR "leaking param: p" "func literal does not escape"
sink = p // ERROR "p escapes to heap"
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs4() {
@@ -50,21 +50,21 @@ func ClosureCallArgs4() {
x := 0 // ERROR "moved to heap: x"
_ = func(p *int) *int { // ERROR "leaking param: p to result ~r1" "func literal does not escape"
return p
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs5() {
x := 0 // ERROR "moved to heap: x"
sink = func(p *int) *int { // ERROR "leaking param: p to result ~r1" "func literal does not escape" "\(func literal\)\(&x\) escapes to heap"
return p
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs6() {
x := 0 // ERROR "moved to heap: x"
func(p *int) { // ERROR "moved to heap: p" "func literal does not escape"
sink = &p // ERROR "&p escapes to heap"
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs7() {
@@ -73,7 +73,7 @@ func ClosureCallArgs7() {
x := 0 // ERROR "moved to heap: x"
func(p *int) { // ERROR "leaking param: p" "func literal does not escape"
pp = p
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
_ = pp
}
@@ -83,7 +83,7 @@ func ClosureCallArgs8() {
defer func(p *int) { // ERROR "p does not escape" "func literal does not escape"
*p = 1
// BAD: x should not escape to heap here
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs9() {
@@ -92,7 +92,7 @@ func ClosureCallArgs9() {
for {
defer func(p *int) { // ERROR "func literal escapes to heap" "p does not escape"
*p = 1
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
}
@@ -101,7 +101,7 @@ func ClosureCallArgs10() {
x := 0 // ERROR "moved to heap: x"
defer func(p *int) { // ERROR "func literal escapes to heap" "p does not escape"
*p = 1
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
}
@@ -109,7 +109,7 @@ func ClosureCallArgs11() {
x := 0 // ERROR "moved to heap: x"
defer func(p *int) { // ERROR "leaking param: p" "func literal does not escape"
sink = p // ERROR "p escapes to heap"
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs12() {
@@ -117,33 +117,33 @@ func ClosureCallArgs12() {
x := 0 // ERROR "moved to heap: x"
defer func(p *int) *int { // ERROR "leaking param: p to result ~r1" "func literal does not escape"
return p
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs13() {
x := 0 // ERROR "moved to heap: x"
defer func(p *int) { // ERROR "moved to heap: p" "func literal does not escape"
sink = &p // ERROR "&p escapes to heap"
- }(&x) // ERROR "&x escapes to heap"
+ }(&x)
}
func ClosureCallArgs14() {
x := 0 // ERROR "moved to heap: x"
// BAD: &x should not escape here
- p := &x // ERROR "moved to heap: p" "&x escapes to heap"
+ p := &x // ERROR "moved to heap: p"
_ = func(p **int) *int { // ERROR "leaking param: p to result ~r1 level=1" "func literal does not escape"
return *p
// BAD: p should not escape here
- }(&p) // ERROR "&p escapes to heap"
+ }(&p)
}
func ClosureCallArgs15() {
x := 0 // ERROR "moved to heap: x"
- p := &x // ERROR "moved to heap: p" "&x escapes to heap"
+ p := &x // ERROR "moved to heap: p"
sink = func(p **int) *int { // ERROR "leaking param: p to result ~r1 level=1" "func literal does not escape" "\(func literal\)\(&p\) escapes to heap"
return *p
// BAD: p should not escape here
- }(&p) // ERROR "&p escapes to heap"
+ }(&p)
}
func ClosureLeak1(s string) string { // ERROR "ClosureLeak1 s does not escape"