From patchwork Tue Mar 20 19:15:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 147825 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 37894B6F62 for ; Wed, 21 Mar 2012 06:15:54 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1332875755; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=gifyGmH /TuV5yDLcB+T8QyiGkQA=; b=vhoTAx1hvWVJpOlM5OjwjbviCPprJakATx6pwFR RGUESY+6xq+eDKMaG/sKTY9i7bUyriXwEvHET9nFJ+NWxV5aXzOOhPpbJwHnYcHs phchcQb/RnmBeamouQYQugi4w21hnL+gbZxd9dSOa7pcjNLgkaV6u44BuH83b1ut 35L8= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=ECfPzSo7S8tWWqgSmow6r2bB+qcDpethSUbbwr8YCEOUZHiAkfqI37nt2i2+j0 8zxxtQGEFEDIzmyKszP/4sY3Uu9tod/Srk/Xb60Ukx+KEckuI+Leym6EoaFAugg6 vnF7sfWiKvJLHsfqODU1EQnzoSlh5wiH90s+yGb91Q9yI=; Received: (qmail 29264 invoked by alias); 20 Mar 2012 19:15:50 -0000 Received: (qmail 29256 invoked by uid 22791); 20 Mar 2012 19:15:49 -0000 X-SWARE-Spam-Status: No, hits=-6.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 20 Mar 2012 19:15:34 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2KJFXxB019816 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Mar 2012 15:15:33 -0400 Received: from [10.3.113.35] (ovpn-113-35.phx2.redhat.com [10.3.113.35]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2KJFXww026663 for ; Tue, 20 Mar 2012 15:15:33 -0400 Message-ID: <4F68D754.2020500@redhat.com> Date: Tue, 20 Mar 2012 15:15:32 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0.1) Gecko/20120216 Thunderbird/10.0.1 MIME-Version: 1.0 To: gcc-patches List Subject: PATCH to tree-streamer-in.c to fix bootstrap with --enable-gather-detailed-mem-stats 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 The _stat allocation functions aren't supposed to be called directly. Tested x86_64-pc-linux-gnu, applying as obvious. commit f0e560b78591a50e39bf3ccf41bc3d87f43927e8 Author: Jason Merrill Date: Mon Mar 19 16:35:05 2012 -0400 * tree-streamer-in.c (streamer_alloc_tree): Call ggc_alloc_zone_cleared_tree_node instead of ggc_alloc_zone_cleared_tree_node_stat. diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c index 50ea77d..97c78cd 100644 --- a/gcc/tree-streamer-in.c +++ b/gcc/tree-streamer-in.c @@ -476,9 +476,9 @@ streamer_alloc_tree (struct lto_input_block *ib, struct data_in *data_in, else if (CODE_CONTAINS_STRUCT (code, TS_VECTOR)) { HOST_WIDE_INT len = streamer_read_hwi (ib); - result = ggc_alloc_zone_cleared_tree_node_stat (&tree_zone, - (len - 1) * sizeof (tree) - + sizeof (struct tree_vector)); + result = ggc_alloc_zone_cleared_tree_node ((len - 1) * sizeof (tree) + + sizeof (struct tree_vector), + &tree_zone); TREE_SET_CODE (result, VECTOR_CST); } else if (CODE_CONTAINS_STRUCT (code, TS_BINFO))