From owner-svn-src-all@freebsd.org  Fri May 20 14:36:50 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 E0758B4298C;
 Fri, 20 May 2016 14:36:50 +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 B2D0E1481;
 Fri, 20 May 2016 14:36:50 +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 u4KEanH7031013;
 Fri, 20 May 2016 14:36:49 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4KEanoi031012;
 Fri, 20 May 2016 14:36:49 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201605201436.u4KEanoi031012@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 14:36:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300301 - 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 14:36:51 -0000

Author: pfg
Date: Fri May 20 14:36:49 2016
New Revision: 300301
URL: https://svnweb.freebsd.org/changeset/base/300301

Log:
  GCC: Add support for named initializers for anonymous structs/unions.
  
  This is a C11 feature that is starting to get used in places such as Mesa.
  This implementation takes a different approach to upstream and is
  therefore not covered by GPLv3.
  
  Obtained from:	OpenBSD (CVS rev. 1.2)
  MFC after:	3 weeks

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

Modified: head/contrib/gcc/c-typeck.c
==============================================================================
--- head/contrib/gcc/c-typeck.c	Fri May 20 13:11:07 2016	(r300300)
+++ head/contrib/gcc/c-typeck.c	Fri May 20 14:36:49 2016	(r300301)
@@ -6041,6 +6041,7 @@ set_init_index (tree first, tree last)
 void
 set_init_label (tree fieldname)
 {
+  tree anon = NULL_TREE;
   tree tail;
 
   if (set_designator (0))
@@ -6058,6 +6059,15 @@ set_init_label (tree fieldname)
   for (tail = TYPE_FIELDS (constructor_type); tail;
        tail = TREE_CHAIN (tail))
     {
+      if (DECL_NAME (tail) == NULL_TREE
+	  && (TREE_CODE (TREE_TYPE (tail)) == RECORD_TYPE
+	      || TREE_CODE (TREE_TYPE (tail)) == UNION_TYPE))
+	{
+	  anon = lookup_field (tail, fieldname);
+	  if (anon)
+	    break;
+	}
+
       if (DECL_NAME (tail) == fieldname)
 	break;
     }