From owner-svn-src-head@FreeBSD.ORG  Sat Jul 30 21:08:34 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B03711065672;
	Sat, 30 Jul 2011 21:08:34 +0000 (UTC)
	(envelope-from rdivacky@vlakno.cz)
Received: from vlakno.cz (lev.vlakno.cz [46.28.110.116])
	by mx1.freebsd.org (Postfix) with ESMTP id 7162F8FC12;
	Sat, 30 Jul 2011 21:08:33 +0000 (UTC)
Received: by vlakno.cz (Postfix, from userid 1002)
	id 90B8F7F38B0; Sat, 30 Jul 2011 23:08:31 +0200 (CEST)
Date: Sat, 30 Jul 2011 23:08:31 +0200
From: Roman Divacky <rdivacky@freebsd.org>
To: Martin Matuska <mm@FreeBSD.org>
Message-ID: <20110730210831.GA98105@freebsd.org>
References: <201107301727.p6UHRTBr008855@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201107301727.p6UHRTBr008855@svn.freebsd.org>
User-Agent: Mutt/1.4.2.3i
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r224523 - head/contrib/gcc/cp
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jul 2011 21:08:34 -0000

Why are we compiling our in-tree gcc with assertions enabled in the first
place?

On Sat, Jul 30, 2011 at 05:27:29PM +0000, Martin Matuska wrote:
> Author: mm
> Date: Sat Jul 30 17:27:29 2011
> New Revision: 224523
> URL: http://svn.freebsd.org/changeset/base/224523
> 
> Log:
>   Fix invalid assertion of C++ external static data member declarations
>   as anonymous namespaces are local to the current translation.
>   
>   GCC PR:		c++/33094
>   
>   Reviewed by:	uqs
>   Approved by:	re (kib)
>   Obtained from:	gcc (branches/redhat/gcc-4_1-branch, rev. 129554, GPLv2)
>   MFC after:	1 week
> 
> Modified:
>   head/contrib/gcc/cp/ChangeLog
>   head/contrib/gcc/cp/decl.c
> 
> Modified: head/contrib/gcc/cp/ChangeLog
> ==============================================================================
> --- head/contrib/gcc/cp/ChangeLog	Sat Jul 30 14:13:57 2011	(r224522)
> +++ head/contrib/gcc/cp/ChangeLog	Sat Jul 30 17:27:29 2011	(r224523)
> @@ -1,3 +1,9 @@
> +2007-09-29  Jason Merrill  <jason@redhat.com>
> +
> +	PR c++/33094
> +	* decl.c (make_rtl_for_nonlocal_decl): It's ok for a member
> +	constant to not have DECL_EXTERNAL if it's file-local.
> +
>  2007-08-24  Jakub Jelinek  <jakub@redhat.com>
>  
>  	PR c++/31941
> 
> Modified: head/contrib/gcc/cp/decl.c
> ==============================================================================
> --- head/contrib/gcc/cp/decl.c	Sat Jul 30 14:13:57 2011	(r224522)
> +++ head/contrib/gcc/cp/decl.c	Sat Jul 30 17:27:29 2011	(r224523)
> @@ -4968,7 +4968,7 @@ make_rtl_for_nonlocal_decl (tree decl, t
>        /* An in-class declaration of a static data member should be
>  	 external; it is only a declaration, and not a definition.  */
>        if (init == NULL_TREE)
> -	gcc_assert (DECL_EXTERNAL (decl));
> +	gcc_assert (DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl));
>      }
>  
>    /* We don't create any RTL for local variables.  */