compiler: Consider the depth of a nested composite literal during traversal.

Fixes issue 7590.

From-SVN: r208731

diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc
index 6ac18f570e8694cebb3d0eab208562574f085dea..643a233ba004ff4ab4bab7b9e4964f7cb4fc9f5e 100644 (file)
--- a/gcc/go/gofrontend/expressions.cc
+++ b/gcc/go/gofrontend/expressions.cc
@@ -13483,6 +13483,20 @@ Composite_literal_expression::do_traverse(Traverse* traverse)
     {
       // The type may not be resolvable at this point.
       Type* type = this->type_;
+
+      for (int depth = this->depth_; depth > 0; --depth)
+        {
+          if (type->array_type() != NULL)
+            type = type->array_type()->element_type();
+          else if (type->map_type() != NULL)
+            type = type->map_type()->val_type();
+          else
+            {
+              // This error will be reported during lowering.
+              return TRAVERSE_CONTINUE;
+            }
+        }
+
       while (true)
        {
          if (type->classification() == Type::TYPE_NAMED)