diff options
author | Than McIntosh <thanm@google.com> | 2021-05-18 12:58:02 -0400 |
---|---|---|
committer | Than McIntosh <thanm@google.com> | 2021-05-18 20:04:57 +0000 |
commit | 6d2ef2ef2a3ed375b5c782e6c8b0f8a59c3d3c8c (patch) | |
tree | 5b727bd064ba6712b12a4312caed4e5ede6f71c5 /test/closure3.dir | |
parent | 048cb4ceee652e358d84fbca260fc93d7a0dfbe3 (diff) | |
download | go-6d2ef2ef2a3ed375b5c782e6c8b0f8a59c3d3c8c.tar.gz go-6d2ef2ef2a3ed375b5c782e6c8b0f8a59c3d3c8c.zip |
cmd/compile: don't emit inltree for closure within body of inlined func
When inlining functions with closures, ensure that we don't mark the
body of the closure with a src.Pos marker that reflects the inline,
since this will result in the generation of an inltree table for the
closure itself (as opposed to the routine that the func-with-closure
was inlined into).
Fixes #46234.
Change-Id: I348296de6504fc4745d99adab436640f50be299a
Reviewed-on: https://go-review.googlesource.com/c/go/+/320913
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Than McIntosh <thanm@google.com>
Diffstat (limited to 'test/closure3.dir')
-rw-r--r-- | test/closure3.dir/main.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/closure3.dir/main.go b/test/closure3.dir/main.go index 2fc33753ed..662a2e967b 100644 --- a/test/closure3.dir/main.go +++ b/test/closure3.dir/main.go @@ -94,10 +94,10 @@ func main() { return x + 2 } y, sink = func() (func(int) int, int) { // ERROR "can inline main.func12" - return func(x int) int { // ERROR "can inline main.func12" + return func(x int) int { // ERROR "func literal does not escape" "can inline main.func12" return x + 1 }, 42 - }() // ERROR "func literal does not escape" "inlining call to main.func12" + }() // ERROR "inlining call to main.func12" if y(40) != 41 { ppanic("y(40) != 41") } @@ -109,10 +109,10 @@ func main() { return x + 2 } y, sink = func() (func(int) int, int) { // ERROR "can inline main.func13.2" - return func(x int) int { // ERROR "can inline main.func13.2" + return func(x int) int { // ERROR "func literal does not escape" "can inline main.func13.2" return x + 1 }, 42 - }() // ERROR "inlining call to main.func13.2" "func literal does not escape" + }() // ERROR "inlining call to main.func13.2" if y(40) != 41 { ppanic("y(40) != 41") } |