2017-11-02 20:54:46 -06:00
|
|
|
// Copyright 2017 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.
|
|
|
|
|
2018-10-06 00:10:25 -06:00
|
|
|
// Check correctness of various closure corner cases
|
2017-11-02 20:54:46 -06:00
|
|
|
// that are expected to be inlined
|
|
|
|
|
|
|
|
package main
|
|
|
|
|
|
|
|
var ok bool
|
|
|
|
var sink int
|
|
|
|
|
|
|
|
func main() {
|
|
|
|
{
|
|
|
|
if x := func() int { // ERROR "can inline main.func1"
|
|
|
|
return 1
|
|
|
|
}(); x != 1 { // ERROR "inlining call to main.func1"
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("x != 1")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
if x := func() int { // ERROR "can inline main.func2" "func literal does not escape"
|
|
|
|
return 1
|
|
|
|
}; x() != 1 { // ERROR "inlining call to main.func2"
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("x() != 1")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
if y := func(x int) int { // ERROR "can inline main.func3"
|
|
|
|
return x + 2
|
|
|
|
}(40); y != 42 { // ERROR "inlining call to main.func3"
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y != 42")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
if y := func(x int) int { // ERROR "can inline main.func4" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}; y(40) != 42 { // ERROR "inlining call to main.func4"
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 42")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func5" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
|
|
|
y = func(x int) int { // ERROR "can inline main.func6" "func literal does not escape"
|
|
|
|
return x + 1
|
|
|
|
}
|
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
func() { // ERROR "func literal does not escape"
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func7.1" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
|
|
|
y = func(x int) int { // ERROR "can inline main.func7.2" "func literal does not escape"
|
|
|
|
return x + 1
|
|
|
|
}
|
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func8" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
|
|
|
y, sink = func(x int) int { // ERROR "can inline main.func9" "func literal does not escape"
|
|
|
|
return x + 1
|
|
|
|
}, 42
|
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
func() { // ERROR "func literal does not escape"
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func10.1" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
|
|
|
y, sink = func(x int) int { // ERROR "can inline main.func10.2" "func literal does not escape"
|
|
|
|
return x + 1
|
|
|
|
}, 42
|
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func11" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
y, sink = func() (func(int) int, int) { // ERROR "can inline main.func12"
|
|
|
|
return func(x int) int { // ERROR "can inline main.func12"
|
2017-11-02 20:54:46 -06:00
|
|
|
return x + 1
|
|
|
|
}, 42
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
}() // ERROR "func literal does not escape" "inlining call to main.func12"
|
2017-11-02 20:54:46 -06:00
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
func() { // ERROR "func literal does not escape"
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
y := func(x int) int { // ERROR "func literal does not escape" "can inline main.func13.1"
|
2017-11-02 20:54:46 -06:00
|
|
|
return x + 2
|
|
|
|
}
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
y, sink = func() (func(int) int, int) { // ERROR "can inline main.func13.2"
|
|
|
|
return func(x int) int { // ERROR "can inline main.func13.2"
|
2017-11-02 20:54:46 -06:00
|
|
|
return x + 1
|
|
|
|
}, 42
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
}() // ERROR "inlining call to main.func13.2" "func literal does not escape"
|
2017-11-02 20:54:46 -06:00
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func14" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
2018-06-06 10:38:35 -06:00
|
|
|
y, ok = map[int]func(int) int{ // ERROR "does not escape"
|
|
|
|
0: func(x int) int { return x + 1 }, // ERROR "can inline main.func15" "func literal escapes"
|
2017-11-02 20:54:46 -06:00
|
|
|
}[0]
|
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
func() { // ERROR "func literal does not escape"
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func16.1" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
2018-06-06 10:38:35 -06:00
|
|
|
y, ok = map[int]func(int) int{ // ERROR "does not escape"
|
2017-11-02 20:54:46 -06:00
|
|
|
0: func(x int) int { return x + 1 }, // ERROR "can inline main.func16.2" "func literal escapes"
|
|
|
|
}[0]
|
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func17" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
2018-06-06 10:38:35 -06:00
|
|
|
y, ok = interface{}(func(x int) int { // ERROR "can inline main.func18" "does not escape"
|
2017-11-02 20:54:46 -06:00
|
|
|
return x + 1
|
2018-06-06 10:38:35 -06:00
|
|
|
}).(func(int) int)
|
2017-11-02 20:54:46 -06:00
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
func() { // ERROR "func literal does not escape"
|
|
|
|
y := func(x int) int { // ERROR "can inline main.func19.1" "func literal does not escape"
|
|
|
|
return x + 2
|
|
|
|
}
|
|
|
|
y, ok = interface{}(func(x int) int { // ERROR "can inline main.func19.2" "does not escape"
|
|
|
|
return x + 1
|
|
|
|
}).(func(int) int)
|
|
|
|
if y(40) != 41 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y(40) != 41")
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
}
|
2017-10-21 16:58:37 -06:00
|
|
|
|
|
|
|
{
|
|
|
|
x := 42
|
|
|
|
if y := func() int { // ERROR "can inline main.func20"
|
|
|
|
return x
|
|
|
|
}(); y != 42 { // ERROR "inlining call to main.func20"
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y != 42")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
if y := func() int { // ERROR "can inline main.func21" "func literal does not escape"
|
|
|
|
return x
|
|
|
|
}; y() != 42 { // ERROR "inlining call to main.func21"
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("y() != 42")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
x := 42
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
if z := func(y int) int { // ERROR "can inline main.func22"
|
|
|
|
return func() int { // ERROR "can inline main.func22.1" "can inline main.func30"
|
2017-10-21 16:58:37 -06:00
|
|
|
return x + y
|
|
|
|
}() // ERROR "inlining call to main.func22.1"
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
}(1); z != 43 { // ERROR "inlining call to main.func22" "inlining call to main.func30"
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("z != 43")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
if z := func(y int) int { // ERROR "func literal does not escape" "can inline main.func23"
|
|
|
|
return func() int { // ERROR "can inline main.func23.1" "can inline main.func31"
|
2017-10-21 16:58:37 -06:00
|
|
|
return x + y
|
|
|
|
}() // ERROR "inlining call to main.func23.1"
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
}; z(1) != 43 { // ERROR "inlining call to main.func23" "inlining call to main.func31"
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("z(1) != 43")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
a := 1
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
func() { // ERROR "can inline main.func24"
|
|
|
|
func() { // ERROR "can inline main.func24" "can inline main.func32"
|
2017-10-21 16:58:37 -06:00
|
|
|
a = 2
|
2019-04-01 12:58:33 -06:00
|
|
|
}() // ERROR "inlining call to main.func24"
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
}() // ERROR "inlining call to main.func24" "inlining call to main.func32"
|
2017-10-21 16:58:37 -06:00
|
|
|
if a != 2 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("a != 2")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
b := 2
|
|
|
|
func(b int) { // ERROR "func literal does not escape"
|
|
|
|
func() { // ERROR "can inline main.func25.1"
|
|
|
|
b = 3
|
2019-04-01 12:58:33 -06:00
|
|
|
}() // ERROR "inlining call to main.func25.1"
|
2017-10-21 16:58:37 -06:00
|
|
|
if b != 3 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("b != 3")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
}(b)
|
|
|
|
if b != 2 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("b != 2")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
c := 3
|
|
|
|
func() { // ERROR "func literal does not escape"
|
|
|
|
c = 4
|
|
|
|
func() { // ERROR "func literal does not escape"
|
|
|
|
if c != 4 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("c != 4")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
2020-09-21 21:20:00 -06:00
|
|
|
recover() // prevent inlining
|
2017-10-21 16:58:37 -06:00
|
|
|
}()
|
|
|
|
}()
|
|
|
|
if c != 4 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("c != 4")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
a := 2
|
|
|
|
if r := func(x int) int { // ERROR "func literal does not escape"
|
|
|
|
b := 3
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
return func(y int) int { // ERROR "can inline main.func27.1"
|
2017-10-21 16:58:37 -06:00
|
|
|
c := 5
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
return func(z int) int { // ERROR "can inline main.func27.1.1" "can inline main.func27.2"
|
2017-10-21 16:58:37 -06:00
|
|
|
return a*x + b*y + c*z
|
|
|
|
}(10) // ERROR "inlining call to main.func27.1.1"
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
}(100) // ERROR "inlining call to main.func27.1" "inlining call to main.func27.2"
|
2017-10-21 16:58:37 -06:00
|
|
|
}(1000); r != 2350 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("r != 2350")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
a := 2
|
|
|
|
if r := func(x int) int { // ERROR "func literal does not escape"
|
|
|
|
b := 3
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
return func(y int) int { // ERROR "can inline main.func28.1"
|
2017-10-21 16:58:37 -06:00
|
|
|
c := 5
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
func(z int) { // ERROR "can inline main.func28.1.1" "can inline main.func28.2"
|
2017-10-21 16:58:37 -06:00
|
|
|
a = a * x
|
|
|
|
b = b * y
|
|
|
|
c = c * z
|
2019-04-01 12:58:33 -06:00
|
|
|
}(10) // ERROR "inlining call to main.func28.1.1"
|
2017-10-21 16:58:37 -06:00
|
|
|
return a + c
|
[dev.regabi] cmd/compile: exporting, importing, and inlining functions with OCLOSURE
I have exporting, importing, and inlining of functions with closures
working in all cases (issue #28727). all.bash runs successfully without
errors.
Approach:
- Write out the Func type, Dcls, ClosureVars, and Body when exporting
an OCLOSURE.
- When importing an OCLOSURE, read in the type, dcls, closure vars,
and body, and then do roughly equivalent code to (*noder).funcLit
- During inlining of a closure within inlined function, create new
nodes for all params and local variables (including closure
variables), so they can have a new Curfn and some other field
values. Must substitute not only on the Nbody of the closure, but
also the Type, Cvars, and Dcl fields.
Fixes #28727
Change-Id: I4da1e2567c3fa31a5121afbe82dc4e5ee32b3170
Reviewed-on: https://go-review.googlesource.com/c/go/+/283112
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Trust: Dan Scales <danscales@google.com>
2020-12-01 15:48:03 -07:00
|
|
|
}(100) + b // ERROR "inlining call to main.func28.1" "inlining call to main.func28.2"
|
2017-10-21 16:58:37 -06:00
|
|
|
}(1000); r != 2350 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("r != 2350")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
if a != 2000 {
|
2018-06-06 10:38:35 -06:00
|
|
|
ppanic("a != 2000")
|
2017-10-21 16:58:37 -06:00
|
|
|
}
|
|
|
|
}
|
2017-11-02 20:54:46 -06:00
|
|
|
}
|
2018-06-06 10:38:35 -06:00
|
|
|
|
|
|
|
//go:noinline
|
|
|
|
func ppanic(s string) { // ERROR "leaking param: s"
|
[dev.regabi] cmd/compile: convert OPANIC argument to interface{} during typecheck
Currently, typecheck leaves arguments to OPANIC as their original
type. This CL changes it to insert implicit OCONVIFACE operations to
convert arguments to `interface{}` like how any other function call
would be handled.
No immediate benefits, other than getting to remove a tiny bit of
special-case logic in order.go's handling of OPANICs. Instead, the
generic code path for handling OCONVIFACE is used, if necessary.
Longer term, this should be marginally helpful for #43753, as it
reduces the number of cases where we need values to be addressable for
runtime calls.
However, this does require adding some hacks to appease existing
tests:
1. We need yet another kludge in inline budgeting, to ensure that
reflect.flag.mustBe stays inlinable for cmd/compile/internal/test's
TestIntendedInlining.
2. Since the OCONVIFACE expressions are now being introduced during
typecheck, they're now visible to escape analysis. So expressions like
"panic(1)" are now seen as "panic(interface{}(1))", and escape
analysis warns that the "interface{}(1)" escapes to the heap. These
have always escaped to heap, just now we're accurately reporting about
it.
(Also, unfortunately fmt.go hides implicit conversions by default in
diagnostics messages, so instead of reporting "interface{}(1) escapes
to heap", it actually reports "1 escapes to heap", which is
confusing. However, this confusing messaging also isn't new.)
Change-Id: Icedf60e1d2e464e219441b8d1233a313770272af
Reviewed-on: https://go-review.googlesource.com/c/go/+/284412
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Trust: Matthew Dempsky <mdempsky@google.com>
2021-01-17 17:14:48 -07:00
|
|
|
panic(s) // ERROR "s escapes to heap"
|
2018-06-06 10:38:35 -06:00
|
|
|
}
|