From owner-svn-src-all@FreeBSD.ORG Tue Nov 26 15:18:41 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75DDAB2E; Tue, 26 Nov 2013 15:18:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 64F15258F; Tue, 26 Nov 2013 15:18:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQFIfmR017926; Tue, 26 Nov 2013 15:18:41 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQFIfw1017925; Tue, 26 Nov 2013 15:18:41 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201311261518.rAQFIfw1017925@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Tue, 26 Nov 2013 15:18:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258653 - head/contrib/gcc/cp 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.16 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Nov 2013 15:18:41 -0000 Author: pfg Date: Tue Nov 26 15:18:40 2013 New Revision: 258653 URL: http://svnweb.freebsd.org/changeset/base/258653 Log: Forced commit to note that r258652 is actually: gcc: Move conditions before an assert. It is a bit cleaner to check the conditions before calling the assertion. It also preserves the style from the rest of the code. This is just a cosmetical change to match better what both Apple's gcc42 and Android's gcc-4.2.1 do. Modified: head/contrib/gcc/cp/decl.c Modified: head/contrib/gcc/cp/decl.c ============================================================================== --- head/contrib/gcc/cp/decl.c Tue Nov 26 14:58:37 2013 (r258652) +++ head/contrib/gcc/cp/decl.c Tue Nov 26 15:18:40 2013 (r258653) @@ -4966,7 +4966,7 @@ make_rtl_for_nonlocal_decl (tree decl, t { gcc_assert (TREE_STATIC (decl)); /* An in-class declaration of a static data member should be - external; it is only a declaration, and not a definition. */ + external; it is only a declaration, and not a definition. */ if (init == NULL_TREE && DECL_INITIAL (decl) == NULL_TREE) gcc_assert (DECL_EXTERNAL (decl)); }