interp: fix populating array of interfaces

Fixes #1308.
traefik · Nov 9, 2021 · 9214806 · 9214806
1 parent 348e713
commit 9214806
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/_test/issue-1308.go b/_test/issue-1308.go
@@ -0,0 +1,27 @@
+package main
+
+import "fmt"
+
+type test struct {
+ v interface{}
+ s string
+}
+
+type T struct {
+ name string
+}
+
+func main() {
+ t := []test{
+ {
+ v: []interface{}{
+ T{"hello"},
+ },
+ s: "world",
+ },
+ }
+ fmt.Println(t)
+}
+
+// Output:
+// [{[{hello}] world}]
diff --git a/interp/run.go b/interp/run.go
@@ -2588,7 +2588,7 @@ func doComposite(n *node, hasType bool, keyed bool) {
  values[fieldIndex] = func(*frame) reflect.Value { return reflect.New(rft).Elem() }
  case isFuncSrc(val.typ):
  values[fieldIndex] = genValueAsFunctionWrapper(val)
- case isArray(val.typ) && val.typ.val != nil && isInterfaceSrc(val.typ.val):
+ case isArray(val.typ) && val.typ.val != nil && isInterfaceSrc(val.typ.val) && !isEmptyInterface(val.typ.val):
  values[fieldIndex] = genValueInterfaceArray(val)
  case isInterfaceSrc(ft) && !isEmptyInterface(ft):
  values[fieldIndex] = genValueInterface(val)