From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25955 invoked by alias); 11 Nov 2015 14:10:47 -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 25929 invoked by uid 89); 11 Nov 2015 14:10:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.3 required=5.0 tests=AWL,BAYES_00,KAM_ASCII_DIVIDERS,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: nef2.ens.fr Received: from nef2.ens.fr (HELO nef2.ens.fr) (129.199.96.40) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 11 Nov 2015 14:10:41 +0000 Received: from mailhost.lps.ens.fr (tournesol.lps.ens.fr [129.199.120.1]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id tABEAcMA055804 ; Wed, 11 Nov 2015 15:10:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mailhost.lps.ens.fr (Postfix) with ESMTP id 98028171; Wed, 11 Nov 2015 15:10:38 +0100 (CET) Received: from mailhost.lps.ens.fr ([127.0.0.1]) by localhost (tournesol.lps.ens.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iyBYc5xISpEc; Wed, 11 Nov 2015 15:10:38 +0100 (CET) Received: from [192.168.1.14] (log78-1-82-242-47-10.fbx.proxad.net [82.242.47.10]) by mailhost.lps.ens.fr (Postfix) with ESMTPSA id 659BB16B; Wed, 11 Nov 2015 15:10:38 +0100 (CET) Content-Type: text/plain; charset=iso-8859-1 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: [PATCH] PR68271 [6 Regression] Boostrap fails on x86_64-apple-darwin14 at r230084 From: =?iso-8859-1?Q?Dominique_d=27Humi=E8res?= In-Reply-To: <20151111131441.GG5675@tucnak.redhat.com> Date: Wed, 11 Nov 2015 14:10:00 -0000 Cc: gcc-patches Content-Transfer-Encoding: quoted-printable Message-Id: <7FDDBC10-24BC-46D6-B497-E5D72091A852@lps.ens.fr> References: <9219A6A9-0D23-47B1-99DF-892D310754EF@lps.ens.fr> <20151111131441.GG5675@tucnak.redhat.com> To: Jakub Jelinek X-SW-Source: 2015-11/txt/msg01375.txt.bz2 Is the following OK? Index: gcc/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/ChangeLog (revision 230162) +++ gcc/ChangeLog (working copy) @@ -1,3 +1,10 @@ +2015-11-11 Dominique d'Humieres + + PR bootstrap/68271 + * cp/parser.h (cp_token): Update pragma_kind to 8. + * c-family/c-pragma.c (c_register_pragma_1): Update the gcc_assert + to 256. + 2015-11-11 Simon Dardis =20 * config/mips/mips.c (mips_breakable_sequence_p): New function. Index: gcc/cp/parser.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/cp/parser.h (revision 230162) +++ gcc/cp/parser.h (working copy) @@ -48,7 +48,7 @@ /* 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 Index: gcc/c-family/c-pragma.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- gcc/c-family/c-pragma.c (revision 230162) +++ gcc/c-family/c-pragma.c (working copy) @@ -1370,9 +1370,9 @@ id =3D registered_pragmas.length (); id +=3D PRAGMA_FIRST_EXTERNAL - 1; =20 - /* 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); + /* The C++ front end allocates 8 bits in cp_token; the C front end + allocates 8 bits in c_token. At present this is sufficient. */ + gcc_assert (id < 256); } =20 cpp_register_deferred_pragma (parse_in, space, name, id, Dominique > Le 11 nov. 2015 =E0 14:14, Jakub Jelinek a =E9crit : >=20 > On Wed, Nov 11, 2015 at 02:11:38PM +0100, Dominique d'Humi=E8res wrote: >> The following patch restore bootstrap on darwin >>=20 >> --- ../_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,=20 >>=20 >> /* 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); >> } >>=20 >> cpp_register_deferred_pragma (parse_in, space, name, id, >>=20 >> OK to commit? >=20 > 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 t= he > token by 64 bits. >=20 > Jakub