From d47db6dc0ce72d1371c81a677b45d7bdba39ff46 Mon Sep 17 00:00:00 2001 From: LE Manh Cuong Date: Sat, 23 Mar 2019 01:43:06 +0700 Subject: [PATCH] cmd/compile: fix literal struct interface {} lost passing by value CL 135377 introduces pass strings and slices to convT2{E,I} by value. Before that CL, all types, except interface will be allocated temporary address. The CL changes the logic that only constant and type which needs address (determine by convFuncName) will be allocated. It fails to cover the case where type is static composite literal. Adding condition to check that case fixes the issue. Also, static composite literal node implies constant type, so consttype checking can be removed. Fixes #30956 Change-Id: Ifc750a029fb4889c2d06e73e44bf85e6ef4ce881 Reviewed-on: https://go-review.googlesource.com/c/go/+/168858 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Keith Randall --- src/cmd/compile/internal/gc/order.go | 6 +++--- test/fixedbugs/issue30956.go | 32 ++++++++++++++++++++++++++++ test/fixedbugs/issue30956.out | 1 + 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 test/fixedbugs/issue30956.go create mode 100644 test/fixedbugs/issue30956.out diff --git a/src/cmd/compile/internal/gc/order.go b/src/cmd/compile/internal/gc/order.go index aae18ff227..3aca63abaf 100644 --- a/src/cmd/compile/internal/gc/order.go +++ b/src/cmd/compile/internal/gc/order.go @@ -1060,10 +1060,10 @@ func (o *Order) expr(n, lhs *Node) *Node { if n.Left.Type.IsInterface() { break } - if _, needsaddr := convFuncName(n.Left.Type, n.Type); needsaddr || consttype(n.Left) > 0 { + if _, needsaddr := convFuncName(n.Left.Type, n.Type); needsaddr || isStaticCompositeLiteral(n.Left) { // Need a temp if we need to pass the address to the conversion function. - // We also process constants here, making a named static global whose - // address we can put directly in an interface (see OCONVIFACE case in walk). + // We also process static composite literal node here, making a named static global + // whose address we can put directly in an interface (see OCONVIFACE case in walk). n.Left = o.addrTemp(n.Left) } diff --git a/test/fixedbugs/issue30956.go b/test/fixedbugs/issue30956.go new file mode 100644 index 0000000000..021e6c5d47 --- /dev/null +++ b/test/fixedbugs/issue30956.go @@ -0,0 +1,32 @@ +// run + +// Copyright 2019 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. + +// Check for compile generated static data for literal +// composite struct + +package main + +import "fmt" + +type X struct { + V interface{} + + a int + b int + c int +} + +func pr(x X) { + fmt.Println(x.V) +} + +func main() { + pr(X{ + V: struct { + A int + }{42}, + }) +} diff --git a/test/fixedbugs/issue30956.out b/test/fixedbugs/issue30956.out new file mode 100644 index 0000000000..04f25e8ae7 --- /dev/null +++ b/test/fixedbugs/issue30956.out @@ -0,0 +1 @@ +{42}