From patchwork Mon May 30 20:08:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Novillo X-Patchwork-Id: 97949 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]) by ozlabs.org (Postfix) with SMTP id 6F202B6F6E for ; Tue, 31 May 2011 06:09:18 +1000 (EST) Received: (qmail 1018 invoked by alias); 30 May 2011 20:09:16 -0000 Received: (qmail 1005 invoked by uid 22791); 30 May 2011 20:09:15 -0000 X-SWARE-Spam-Status: No, hits=-0.9 required=5.0 tests=AWL, BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (74.125.121.67) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 30 May 2011 20:09:01 +0000 Received: from hpaq3.eem.corp.google.com (hpaq3.eem.corp.google.com [172.25.149.3]) by smtp-out.google.com with ESMTP id p4UK90wx012543 for ; Mon, 30 May 2011 13:09:00 -0700 Received: from topo.tor.corp.google.com (topo.tor.corp.google.com [172.29.41.2]) by hpaq3.eem.corp.google.com with ESMTP id p4UK8wbd004555; Mon, 30 May 2011 13:08:58 -0700 Received: by topo.tor.corp.google.com (Postfix, from userid 54752) id 9AC5D1DA1C9; Mon, 30 May 2011 16:08:57 -0400 (EDT) Date: Mon, 30 May 2011 16:08:57 -0400 From: Diego Novillo To: gcc-patches@gcc.gnu.org, Lawrence Crowl Subject: [pph] Update LTO_tags values Message-ID: <20110530200856.GA24898@google.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-System-Of-Record: true X-IsSubscribed: yes 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 Not directly related to the merge, but I found this out while fixing it. We don't need to force the value for LTO_NUM_TAGS and LTO_LAST_TAG is unnecessary. Tested and committed together with the latest merge. Diego. Do not force the value on LTO_NUM_TAGS. --- gcc/ChangeLog.pph | 5 +++++ gcc/lto-streamer.h | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog.pph b/gcc/ChangeLog.pph index 78c7ae8..3494a20 100644 --- a/gcc/ChangeLog.pph +++ b/gcc/ChangeLog.pph @@ -2,6 +2,11 @@ Merge from trunk rev 174363. +2011-05-30 Diego Novillo + + * lto-streamer.h (enum LTO_tags): Remove LTO_LAST_TAG. + Do not force the value on LTO_NUM_TAGS. + 2011-05-06 Diego Novillo * lto-streamer-out.c (lto_output_tree): If the streamer diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h index 9e079a4..c06dcb4 100644 --- a/gcc/lto-streamer.h +++ b/gcc/lto-streamer.h @@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. If not see #include "alloc-pool.h" #include "gcov-io.h" -/* Forward declarations to avoid included unnecessary headers. */ +/* Forward declarations to avoid including unnecessary headers. */ struct output_block; struct lto_input_block; struct data_in; @@ -244,10 +244,9 @@ enum LTO_tags LTO_imported_decl_ref, LTO_translation_unit_decl_ref, LTO_global_decl_ref, /* Do not change. */ - LTO_LAST_TAG, /* This tag must always be last. */ - LTO_NUM_TAGS = LTO_LAST_TAG + MAX_TREE_CODES + LAST_AND_UNUSED_GIMPLE_CODE + LTO_NUM_TAGS };