mirror of
https://github.com/golang/go
synced 2024-11-26 06:27:58 -07:00
cmd/compile: fix late expand_calls leaf type for OpStructSelect/OpArraySelect
For the example in #43551, before late call expansion, the OpArg type is decomposed to int64. But the late call expansion is currently decompose it to "x.Key" instead. This CL make expand_calls decompose further for struct { 1-field type } and array [1]elem. This matches the previous rules for early decompose args: (StructSelect (StructMake1 x)) => x (ArraySelect (ArrayMake1 x)) => x Fixes #43551 Change-Id: I2f1ebe18cb81cb967f494331c3d237535d2859e7 Reviewed-on: https://go-review.googlesource.com/c/go/+/282332 Trust: Cuong Manh Le <cuong.manhle.vn@gmail.com> Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: David Chase <drchase@google.com>
This commit is contained in:
parent
7cee66d4cb
commit
fa90aaca7d
@ -194,7 +194,8 @@ func expandCalls(f *Func) {
|
|||||||
}
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
if leaf.Op == OpIData {
|
switch leaf.Op {
|
||||||
|
case OpIData, OpStructSelect, OpArraySelect:
|
||||||
leafType = removeTrivialWrapperTypes(leaf.Type)
|
leafType = removeTrivialWrapperTypes(leaf.Type)
|
||||||
}
|
}
|
||||||
aux := selector.Aux
|
aux := selector.Aux
|
||||||
|
13
test/fixedbugs/issue43551.dir/a.go
Normal file
13
test/fixedbugs/issue43551.dir/a.go
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
package a
|
||||||
|
|
||||||
|
type S struct {
|
||||||
|
a Key
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s S) A() Key {
|
||||||
|
return s.a
|
||||||
|
}
|
||||||
|
|
||||||
|
type Key struct {
|
||||||
|
key int64
|
||||||
|
}
|
14
test/fixedbugs/issue43551.dir/b.go
Normal file
14
test/fixedbugs/issue43551.dir/b.go
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
// Copyright 2021 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.
|
||||||
|
|
||||||
|
package b
|
||||||
|
|
||||||
|
import "./a"
|
||||||
|
|
||||||
|
type S a.S
|
||||||
|
type Key a.Key
|
||||||
|
|
||||||
|
func (s S) A() Key {
|
||||||
|
return Key(a.S(s).A())
|
||||||
|
}
|
7
test/fixedbugs/issue43551.go
Normal file
7
test/fixedbugs/issue43551.go
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
// compiledir
|
||||||
|
|
||||||
|
// Copyright 2021 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.
|
||||||
|
|
||||||
|
package ignored
|
Loading…
Reference in New Issue
Block a user