Skip to content

Commit

Permalink
test: fix build
Browse files Browse the repository at this point in the history
Fix build after http://golang.org/cl/5297
The compiler was changed to not print implicit map capacity in error messages.

Change-Id: I852f668680c3c69c5eecc7964e46202a97014d6a
Reviewed-on: https://go-review.googlesource.com/8212
Reviewed-by: Dmitry Vyukov <[email protected]>
  • Loading branch information
dvyukov committed Mar 28, 2015
1 parent 6d9fd7e commit 8205bfb
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions test/escape_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package escape
var sink interface{}

func map0() {
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int, 0\) does not escape"
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int\) does not escape"
// BAD: i should not escape
i := 0 // ERROR "moved to heap: i"
// BAD: j should not escape
Expand All @@ -21,7 +21,7 @@ func map0() {
}

func map1() *int {
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int, 0\) does not escape"
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int\) does not escape"
// BAD: i should not escape
i := 0 // ERROR "moved to heap: i"
j := 0 // ERROR "moved to heap: j"
Expand All @@ -30,15 +30,15 @@ func map1() *int {
}

func map2() map[*int]*int {
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int, 0\) escapes to heap"
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int\) escapes to heap"
i := 0 // ERROR "moved to heap: i"
j := 0 // ERROR "moved to heap: j"
m[&i] = &j // ERROR "&i escapes to heap" "&j escapes to heap"
return m
}

func map3() []*int {
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int, 0\) does not escape"
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int\) does not escape"
i := 0 // ERROR "moved to heap: i"
// BAD: j should not escape
j := 0 // ERROR "moved to heap: j"
Expand All @@ -51,7 +51,7 @@ func map3() []*int {
}

func map4() []*int {
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int, 0\) does not escape"
m := make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int\) does not escape"
// BAD: i should not escape
i := 0 // ERROR "moved to heap: i"
j := 0 // ERROR "moved to heap: j"
Expand All @@ -75,7 +75,7 @@ func map5(m map[*int]*int) { // ERROR "m does not escape"

func map6(m map[*int]*int) { // ERROR "m does not escape"
if m != nil {
m = make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int, 0\) does not escape"
m = make(map[*int]*int) // ERROR "make\(map\[\*int\]\*int\) does not escape"
}
i := 0 // ERROR "moved to heap: i"
j := 0 // ERROR "moved to heap: j"
Expand Down

0 comments on commit 8205bfb

Please sign in to comment.