From owner-svn-src-all@freebsd.org  Fri May 20 18:01:54 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3892B44A16;
 Fri, 20 May 2016 18:01:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7567D11A6;
 Fri, 20 May 2016 18:01:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4KI1rnV094093;
 Fri, 20 May 2016 18:01:53 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4KI1r18094092;
 Fri, 20 May 2016 18:01:53 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201605201801.u4KI1r18094092@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 20 May 2016 18:01:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300319 - head/contrib/gcc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 May 2016 18:01:54 -0000

Author: pfg
Date: Fri May 20 18:01:53 2016
New Revision: 300319
URL: https://svnweb.freebsd.org/changeset/base/300319

Log:
  GCC: Add support for named initializers for anonymous structs/unions.
  
  Missing hunk from r300301.
  
  Reported by:	Ed Schouten
  Obtained from:	OpenBSD (CVS rev. 1.2)

Modified:
  head/contrib/gcc/c-typeck.c

Modified: head/contrib/gcc/c-typeck.c
==============================================================================
--- head/contrib/gcc/c-typeck.c	Fri May 20 18:00:10 2016	(r300318)
+++ head/contrib/gcc/c-typeck.c	Fri May 20 18:01:53 2016	(r300319)
@@ -6074,13 +6074,24 @@ set_init_label (tree fieldname)
 
   if (tail == 0)
     error ("unknown field %qE specified in initializer", fieldname);
-  else
+
+  while (tail)
     {
       constructor_fields = tail;
       designator_depth++;
       designator_erroneous = 0;
       if (constructor_range_stack)
 	push_range_stack (NULL_TREE);
+
+      if (anon)
+	{
+	  if (set_designator (0))
+	    return;
+	  tail = TREE_VALUE(anon);
+	  anon = TREE_CHAIN(anon);
+	}
+      else
+	tail = NULL_TREE;
     }
 }