From patchwork Wed Nov 11 14:10:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Dominique_d=27Humi=C3=A8res?= X-Patchwork-Id: 542909 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1EE5D140D8F for ; Thu, 12 Nov 2015 01:10:54 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=xhmSJ7gv; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; q=dns; s= default; b=r0oBpDeWtxmhxEBPGowK6o4YLpi5xFJz/JO/IJNnH9h+1zsr+n/wR nyeqdU3DzNGQ6wEZh2eeNamDgraWa8IsfhF8EArhJ9PZ+MF4I8XuPSte3ed6u6T+ Qf9s7gsFPw4JHPh4PHE8K9KX2E+/hyRoOS7zBuTnneKG30T/g+Pweg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=default; bh=70ilx0Kr/I9XVuE3137GUw+qLVo=; b=xhmSJ7gv5lVNBdcq8XJCtZ5GFkR1 D3hnv7U/nZqXn/ys3lZgZuQLYue+2VkYU6pXldF1cWKMHy14Lrx6Dy5Wr+dUs5gJ ANM+geP0M6uQkT1w7X/hPLX8pjxIcRMOs7a/pA8qTS78RG6WtwtjZpchu0ayumu1 XKOhp79Zbgjw0RY= 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-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@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) 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 15:10:37 +0100 Cc: gcc-patches 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 Is the following OK? Dominique > Le 11 nov. 2015 à 14:14, Jakub Jelinek a écrit : > > 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 Index: gcc/ChangeLog =================================================================== --- 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 * config/mips/mips.c (mips_breakable_sequence_p): New function. Index: gcc/cp/parser.h =================================================================== --- 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 =================================================================== --- gcc/c-family/c-pragma.c (revision 230162) +++ gcc/c-family/c-pragma.c (working copy) @@ -1370,9 +1370,9 @@ id = registered_pragmas.length (); id += PRAGMA_FIRST_EXTERNAL - 1; - /* 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); } cpp_register_deferred_pragma (parse_in, space, name, id,