diff --git a/src/cmd/compile/internal/gc/order.go b/src/cmd/compile/internal/gc/order.go index aae18ff2272..3aca63abafb 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 00000000000..021e6c5d47b --- /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 00000000000..04f25e8ae79 --- /dev/null +++ b/test/fixedbugs/issue30956.out @@ -0,0 +1 @@ +{42}