cmd/compile/internal/inline: score call sites exposed by inlines

[gostls13.git] / test / escape4.go

diff --git a/test/escape4.go b/test/escape4.go
index 69a54ac721b08c03121de26690ddb6567ec4eb56..c4a2fc15e7ec297f1c45841e2cdf9b300463388a 100644 (file)
--- a/test/escape4.go
+++ b/test/escape4.go
@@ -1,5 +1,7 @@
 // errorcheck -0 -m
 
+//go:build !goexperiment.newinliner
+
 // Copyright 2010 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.
@@ -12,46 +14,46 @@ package foo
 var p *int
 
 func alloc(x int) *int { // ERROR "can inline alloc" "moved to heap: x"
-       return &x // ERROR "&x escapes to heap"
+       return &x
 }
 
 var f func()
 
 func f1() {
-       p = alloc(2) // ERROR "inlining call to alloc" "&x escapes to heap" "moved to heap: x"
+       p = alloc(2) // ERROR "inlining call to alloc" "moved to heap: x"
 
        // Escape analysis used to miss inlined code in closures.
 
-       func() { // ERROR "func literal does not escape" "can inline f1.func1"
-               p = alloc(3) // ERROR "inlining call to alloc" "&x escapes to heap" "moved to heap: x"
-       }()
+       func() { // ERROR "can inline f1.func1"
+               p = alloc(3) // ERROR "inlining call to alloc"
+       }() // ERROR "inlining call to f1.func1" "inlining call to alloc" "moved to heap: x"
 
        f = func() { // ERROR "func literal escapes to heap" "can inline f1.func2"
-               p = alloc(3) // ERROR "inlining call to alloc" "&x escapes to heap" "moved to heap: x"
+               p = alloc(3) // ERROR "inlining call to alloc" "moved to heap: x"
        }
        f()
 }
 
 func f2() {} // ERROR "can inline f2"
 
-// No inline for panic, recover.
-func f3() { panic(1) }
+// No inline for recover; panic now allowed to inline.
+func f3() { panic(1) } // ERROR "can inline f3" "1 escapes to heap"
 func f4() { recover() }
 
-func f5() *byte {
+func f5() *byte { // ERROR "can inline f5"
        type T struct {
                x [1]byte
        }
-       t := new(T)    // ERROR "new.T. escapes to heap"
-       return &t.x[0] // ERROR "&t.x.0. escapes to heap"
+       t := new(T) // ERROR "new.T. escapes to heap"
+       return &t.x[0]
 }
 
-func f6() *byte {
+func f6() *byte { // ERROR "can inline f6"
        type T struct {
                x struct {
                        y byte
                }
        }
-       t := new(T)   // ERROR "new.T. escapes to heap"
-       return &t.x.y // ERROR "&t.x.y escapes to heap"
+       t := new(T) // ERROR "new.T. escapes to heap"
+       return &t.x.y
 }