mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
cmd/compile: fix ordering problems in struct equality
Make sure that if a field comparison might panic, we evaluate (and short circuit if not equal) all previous fields, and don't evaluate any subsequent fields. Add a bunch more tests to the equality+panic checker. Update #8606 Change-Id: I6a159bbc8da5b2b7ee835c0cd1fc565575b58c46 Reviewed-on: https://go-review.googlesource.com/c/go/+/237919 Run-TryBot: Keith Randall <khr@golang.org> Reviewed-by: Matthew Dempsky <mdempsky@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
parent
8a33a8c652
commit
8c8045fd38
2 changed files with 101 additions and 21 deletions
|
|
@ -12,22 +12,65 @@ import "fmt"
|
|||
|
||||
func main() {
|
||||
type A [2]interface{}
|
||||
type A2 [6]interface{}
|
||||
type S struct{ x, y interface{} }
|
||||
type S2 struct{ x, y, z, a, b, c interface{} }
|
||||
type T1 struct {
|
||||
i interface{}
|
||||
a int64
|
||||
j interface{}
|
||||
}
|
||||
type T2 struct {
|
||||
i interface{}
|
||||
a, b, c int64
|
||||
j interface{}
|
||||
}
|
||||
type T3 struct {
|
||||
i interface{}
|
||||
s string
|
||||
j interface{}
|
||||
}
|
||||
b := []byte{1}
|
||||
|
||||
for _, test := range []struct {
|
||||
panic bool
|
||||
a, b interface{}
|
||||
}{
|
||||
{false, A{1, []byte{1}}, A{2, []byte{1}}},
|
||||
{true, A{[]byte{1}, 1}, A{[]byte{1}, 2}},
|
||||
{false, S{1, []byte{1}}, S{2, []byte{1}}},
|
||||
{true, S{[]byte{1}, 1}, S{[]byte{1}, 2}},
|
||||
{false, A{1, []byte{1}}, A{"2", []byte{1}}},
|
||||
{true, A{[]byte{1}, 1}, A{[]byte{1}, "2"}},
|
||||
{false, S{1, []byte{1}}, S{"2", []byte{1}}},
|
||||
{true, S{[]byte{1}, 1}, S{[]byte{1}, "2"}},
|
||||
{false, A{1, b}, A{2, b}},
|
||||
{true, A{b, 1}, A{b, 2}},
|
||||
{false, A{1, b}, A{"2", b}},
|
||||
{true, A{b, 1}, A{b, "2"}},
|
||||
|
||||
{false, A2{1, b}, A2{2, b}},
|
||||
{true, A2{b, 1}, A2{b, 2}},
|
||||
{false, A2{1, b}, A2{"2", b}},
|
||||
{true, A2{b, 1}, A2{b, "2"}},
|
||||
|
||||
{false, S{1, b}, S{2, b}},
|
||||
{true, S{b, 1}, S{b, 2}},
|
||||
{false, S{1, b}, S{"2", b}},
|
||||
{true, S{b, 1}, S{b, "2"}},
|
||||
|
||||
{false, S2{x: 1, y: b}, S2{x: 2, y: b}},
|
||||
{true, S2{x: b, y: 1}, S2{x: b, y: 2}},
|
||||
{false, S2{x: 1, y: b}, S2{x: "2", y: b}},
|
||||
{true, S2{x: b, y: 1}, S2{x: b, y: "2"}},
|
||||
|
||||
{true, T1{i: b, a: 1}, T1{i: b, a: 2}},
|
||||
{false, T1{a: 1, j: b}, T1{a: 2, j: b}},
|
||||
{true, T2{i: b, a: 1}, T2{i: b, a: 2}},
|
||||
{false, T2{a: 1, j: b}, T2{a: 2, j: b}},
|
||||
{true, T3{i: b, s: "foo"}, T3{i: b, s: "bar"}},
|
||||
{false, T3{s: "foo", j: b}, T3{s: "bar", j: b}},
|
||||
{true, T3{i: b, s: "fooz"}, T3{i: b, s: "bar"}},
|
||||
{false, T3{s: "fooz", j: b}, T3{s: "bar", j: b}},
|
||||
} {
|
||||
f := func() {
|
||||
defer func() {
|
||||
if recover() != nil {
|
||||
panic(fmt.Sprintf("comparing %#v and %#v panicked", test.a, test.b))
|
||||
}
|
||||
}()
|
||||
if test.a == test.b {
|
||||
panic(fmt.Sprintf("values %#v and %#v should not be equal", test.a, test.b))
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue