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

[gostls13.git] / test / escape_slice.go

diff --git a/test/escape_slice.go b/test/escape_slice.go
index 03053cf3261cae2d82d76d3cf1ac031a14a6db94..65181e57d7edd34559f0eba3a7a46248c3ae7a47 100644 (file)
--- a/test/escape_slice.go
+++ b/test/escape_slice.go
@@ -18,28 +18,28 @@ var sink interface{}
 func slice0() {
        var s []*int
        // BAD: i should not escape
-       i := 0            // ERROR "moved to heap: i"
+       i := 0 // ERROR "moved to heap: i"
        s = append(s, &i)
        _ = s
 }
 
 func slice1() *int {
        var s []*int
-       i := 0            // ERROR "moved to heap: i"
+       i := 0 // ERROR "moved to heap: i"
        s = append(s, &i)
        return s[0]
 }
 
 func slice2() []*int {
        var s []*int
-       i := 0            // ERROR "moved to heap: i"
+       i := 0 // ERROR "moved to heap: i"
        s = append(s, &i)
        return s
 }
 
 func slice3() *int {
        var s []*int
-       i := 0            // ERROR "moved to heap: i"
+       i := 0 // ERROR "moved to heap: i"
        s = append(s, &i)
        for _, p := range s {
                return p
@@ -48,7 +48,7 @@ func slice3() *int {
 }
 
 func slice4(s []*int) { // ERROR "s does not escape"
-       i := 0    // ERROR "moved to heap: i"
+       i := 0 // ERROR "moved to heap: i"
        s[0] = &i
 }
 
@@ -56,14 +56,14 @@ func slice5(s []*int) { // ERROR "s does not escape"
        if s != nil {
                s = make([]*int, 10) // ERROR "make\(\[\]\*int, 10\) does not escape"
        }
-       i := 0    // ERROR "moved to heap: i"
+       i := 0 // ERROR "moved to heap: i"
        s[0] = &i
 }
 
 func slice6() {
        s := make([]*int, 10) // ERROR "make\(\[\]\*int, 10\) does not escape"
        // BAD: i should not escape
-       i := 0    // ERROR "moved to heap: i"
+       i := 0 // ERROR "moved to heap: i"
        s[0] = &i
        _ = s
 }
@@ -77,28 +77,44 @@ func slice7() *int {
 
 func slice8() {
        i := 0
-       s := []*int{&i} // ERROR "literal does not escape"
+       s := []*int{&i} // ERROR "\[\]\*int{...} does not escape"
        _ = s
 }
 
 func slice9() *int {
        i := 0          // ERROR "moved to heap: i"
-       s := []*int{&i} // ERROR "literal does not escape"
+       s := []*int{&i} // ERROR "\[\]\*int{...} does not escape"
        return s[0]
 }
 
 func slice10() []*int {
        i := 0          // ERROR "moved to heap: i"
-       s := []*int{&i} // ERROR "literal escapes to heap"
+       s := []*int{&i} // ERROR "\[\]\*int{...} escapes to heap"
        return s
 }
 
+func slice11() {
+       i := 2
+       s := make([]int, 2, 3) // ERROR "make\(\[\]int, 2, 3\) does not escape"
+       s = make([]int, i, 3)  // ERROR "make\(\[\]int, i, 3\) does not escape"
+       s = make([]int, i, 1)  // ERROR "make\(\[\]int, i, 1\) does not escape"
+       _ = s
+}
+
+func slice12(x []int) *[1]int { // ERROR "leaking param: x to result ~r0 level=0$"
+       return (*[1]int)(x)
+}
+
+func slice13(x []*int) [1]*int { // ERROR "leaking param: x to result ~r0 level=1$"
+       return [1]*int(x)
+}
+
 func envForDir(dir string) []string { // ERROR "dir does not escape"
        env := os.Environ()
-       return mergeEnvLists([]string{"PWD=" + dir}, env) // ERROR ".PWD=. \+ dir escapes to heap" "\[\]string literal does not escape"
+       return mergeEnvLists([]string{"PWD=" + dir}, env) // ERROR ".PWD=. \+ dir escapes to heap" "\[\]string{...} does not escape"
 }
 
-func mergeEnvLists(in, out []string) []string { // ERROR "leaking param content: in" "leaking param content: out" "leaking param: out to result ~r2 level=0"
+func mergeEnvLists(in, out []string) []string { // ERROR "leaking param content: in" "leaking param content: out" "leaking param: out to result ~r0 level=0"
 NextVar:
        for _, inkv := range in {
                k := strings.SplitAfterN(inkv, "=", 2)[0]
@@ -121,7 +137,7 @@ const (
 var v4InV6Prefix = []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff}
 
 func IPv4(a, b, c, d byte) IP {
-       p := make(IP, IPv6len) // ERROR "make\(IP, IPv6len\) escapes to heap"
+       p := make(IP, IPv6len) // ERROR "make\(IP, 16\) escapes to heap"
        copy(p, v4InV6Prefix)
        p[12] = a
        p[13] = b
@@ -152,14 +168,14 @@ var resolveIPAddrTests = []resolveIPAddrTest{
 
 func setupTestData() {
        resolveIPAddrTests = append(resolveIPAddrTests,
-               []resolveIPAddrTest{ // ERROR "\[\]resolveIPAddrTest literal does not escape"
+               []resolveIPAddrTest{ // ERROR "\[\]resolveIPAddrTest{...} does not escape"
                        {"ip",
                                "localhost",
-                               &IPAddr{IP: IPv4(127, 0, 0, 1)}, // ERROR "&IPAddr literal escapes to heap"
+                               &IPAddr{IP: IPv4(127, 0, 0, 1)}, // ERROR "&IPAddr{...} escapes to heap"
                                nil},
                        {"ip4",
                                "localhost",
-                               &IPAddr{IP: IPv4(127, 0, 0, 1)}, // ERROR "&IPAddr literal escapes to heap"
+                               &IPAddr{IP: IPv4(127, 0, 0, 1)}, // ERROR "&IPAddr{...} escapes to heap"
                                nil},
                }...)
 }