From fa90aaca7d523eaf81c02b48a412cad4ebc57817 Mon Sep 17 00:00:00 2001 From: Cuong Manh Le Date: Thu, 7 Jan 2021 21:45:00 +0700 Subject: [PATCH] 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 Run-TryBot: Cuong Manh Le TryBot-Result: Go Bot Reviewed-by: David Chase --- src/cmd/compile/internal/ssa/expand_calls.go | 3 ++- test/fixedbugs/issue43551.dir/a.go | 13 +++++++++++++ test/fixedbugs/issue43551.dir/b.go | 14 ++++++++++++++ test/fixedbugs/issue43551.go | 7 +++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 test/fixedbugs/issue43551.dir/a.go create mode 100644 test/fixedbugs/issue43551.dir/b.go create mode 100644 test/fixedbugs/issue43551.go diff --git a/src/cmd/compile/internal/ssa/expand_calls.go b/src/cmd/compile/internal/ssa/expand_calls.go index fbde19d94c..679ee8ad16 100644 --- a/src/cmd/compile/internal/ssa/expand_calls.go +++ b/src/cmd/compile/internal/ssa/expand_calls.go @@ -194,7 +194,8 @@ func expandCalls(f *Func) { } break } - if leaf.Op == OpIData { + switch leaf.Op { + case OpIData, OpStructSelect, OpArraySelect: leafType = removeTrivialWrapperTypes(leaf.Type) } aux := selector.Aux diff --git a/test/fixedbugs/issue43551.dir/a.go b/test/fixedbugs/issue43551.dir/a.go new file mode 100644 index 0000000000..d890dd0c65 --- /dev/null +++ b/test/fixedbugs/issue43551.dir/a.go @@ -0,0 +1,13 @@ +package a + +type S struct { + a Key +} + +func (s S) A() Key { + return s.a +} + +type Key struct { + key int64 +} diff --git a/test/fixedbugs/issue43551.dir/b.go b/test/fixedbugs/issue43551.dir/b.go new file mode 100644 index 0000000000..ba062bf14c --- /dev/null +++ b/test/fixedbugs/issue43551.dir/b.go @@ -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()) +} diff --git a/test/fixedbugs/issue43551.go b/test/fixedbugs/issue43551.go new file mode 100644 index 0000000000..b83fbd7af1 --- /dev/null +++ b/test/fixedbugs/issue43551.go @@ -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