From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 97606 invoked by alias); 11 Nov 2015 13:14:52 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 97594 invoked by uid 89); 11 Nov 2015 13:14:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 11 Nov 2015 13:14:50 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id E9A0BB8930; Wed, 11 Nov 2015 13:14:48 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tABDEjB5016505 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 11 Nov 2015 08:14:46 -0500 Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id tABDEhAf027568; Wed, 11 Nov 2015 14:14:43 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id tABDEfhU027567; Wed, 11 Nov 2015 14:14:41 +0100 Date: Wed, 11 Nov 2015 13:14:00 -0000 From: Jakub Jelinek To: "Dominique =?iso-8859-1?Q?d'Humi=E8res?=" Cc: gcc-patches Subject: Re: [PATCH] PR68271 [6 Regression] Boostrap fails on x86_64-apple-darwin14 at r230084 Message-ID: <20151111131441.GG5675@tucnak.redhat.com> Reply-To: Jakub Jelinek References: <9219A6A9-0D23-47B1-99DF-892D310754EF@lps.ens.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <9219A6A9-0D23-47B1-99DF-892D310754EF@lps.ens.fr> User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes X-SW-Source: 2015-11/txt/msg01364.txt.bz2 On Wed, Nov 11, 2015 at 02:11:38PM +0100, Dominique d'Humières wrote: > The following patch restore bootstrap on darwin > > --- ../_clean/gcc/cp/parser.h 2015-11-10 01:54:44.000000000 +0100 > +++ gcc/cp/parser.h 2015-11-11 12:10:28.000000000 +0100 > @@ -48,7 +48,7 @@ struct GTY (()) cp_token { > /* Token flags. */ > unsigned char flags; > /* Identifier for the pragma. */ > - ENUM_BITFIELD (pragma_kind) pragma_kind : 6; > + ENUM_BITFIELD (pragma_kind) pragma_kind : 8; > /* True if this token is from a context where it is implicitly extern "C" */ > BOOL_BITFIELD implicit_extern_c : 1; > /* True if an error has already been reported for this token, such as a > --- ../_clean/gcc/c-family/c-pragma.c 2015-11-10 01:54:43.000000000 +0100 > +++ gcc/c-family/c-pragma.c 2015-11-11 12:10:25.000000000 +0100 > @@ -1372,7 +1372,7 @@ c_register_pragma_1 (const char *space, > > /* The C++ front end allocates 6 bits in cp_token; the C front end > allocates 7 bits in c_token. At present this is sufficient. */ > - gcc_assert (id < 64); > + gcc_assert (id < 256); > } > > cpp_register_deferred_pragma (parse_in, space, name, id, > > OK to commit? As written in the PR, please add a ChangeLog entry, don't forget about PR bootstrap/68271 line, and please update the 6 and 7 numbers in the comment to 8. With that the patch is ok. As a follow-up, we'll remove pragma_kind field in the C++ FE, to shrink the token by 64 bits. Jakub