From patchwork Fri Dec 6 14:51:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 298053 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B8FBB2C00A0 for ; Sat, 7 Dec 2013 02:08:41 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references; q=dns; s= default; b=ClRKDxAVbsCMKdB/ONLBC7UNOO5N4i16u+XyKeNcYO+dU3vFRoBRA QMnklirUDuWbmmfGBShB5cnUcbUTGASNVdFwFLRZfcclxDMPg3Lxa3+98+/b8A3S lK7bHguBOSJ4aKS1z6SSVQcCQb8KhWkpiqKweL+qb7SUIF3c3jYuzg= 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:from :to:cc:subject:date:message-id:in-reply-to:references; s= default; bh=pzD33W/EmOy/n6j5TaBqfuPOfCU=; b=tg8kjCnheovST1G40Ipo QQBnP2hI7S9OBtsKDloxdGNrmkk4H7Dlnj4/aYKplPkqMd2p7EDet0aYxGQ22adx 6+gJ8awbyvg6RzuUaYH2VUp/dk6bAESUBa/ZnJQF2D4EDsFSFX+qsWlBpvW9MS7y 8paGpg7Wa8A/j8Dgf3BlVhM= Received: (qmail 6012 invoked by alias); 6 Dec 2013 15:08:31 -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 5972 invoked by uid 89); 6 Dec 2013 15:08:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: eggs.gnu.org Received: from Unknown (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 06 Dec 2013 15:08:30 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vowls-0005w9-9Z for gcc-patches@gcc.gnu.org; Fri, 06 Dec 2013 09:52:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40600) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vowls-0005w5-0D for gcc-patches@gcc.gnu.org; Fri, 06 Dec 2013 09:52:48 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rB6EqlUr001456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 6 Dec 2013 09:52:47 -0500 Received: from surprise.redhat.com (vpn-229-183.phx2.redhat.com [10.3.229.183]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rB6Eqd3b029860; Fri, 6 Dec 2013 09:52:46 -0500 From: David Malcolm To: Richard Biener Cc: gcc-patches@gcc.gnu.org, David Malcolm Subject: [PATCH 08/13] Eliminate label_to_block_map macro. Date: Fri, 6 Dec 2013 09:51:34 -0500 Message-Id: <1386341499-19603-9-git-send-email-dmalcolm@redhat.com> In-Reply-To: <1386341499-19603-1-git-send-email-dmalcolm@redhat.com> References: <1384898628.11568.127.camel@surprise> <1386341499-19603-1-git-send-email-dmalcolm@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 X-IsSubscribed: yes gcc/ * basic-block.h (label_to_block_map): Eliminate macro. * gimple.c (gimple_set_bb): Replace uses of label_to_block_map with uses of label_to_block_map_for_fn, making uses of cfun be explicit. * tree-cfg.c (delete_tree_cfg_annotations): Likewise. (verify_gimple_label): Likewise. --- gcc/basic-block.h | 1 - gcc/gimple.c | 8 +++++--- gcc/tree-cfg.c | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 69689f3..4ab8289 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -328,7 +328,6 @@ struct GTY(()) control_flow_graph { /* Defines for textual backward source compatibility. */ #define last_basic_block (cfun->cfg->x_last_basic_block) -#define label_to_block_map (cfun->cfg->x_label_to_block_map) #define profile_status (cfun->cfg->x_profile_status) /* For iterating over basic blocks. */ diff --git a/gcc/gimple.c b/gcc/gimple.c index f11362a..077dca5 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -1475,17 +1475,19 @@ gimple_set_bb (gimple stmt, basic_block bb) uid = LABEL_DECL_UID (t); if (uid == -1) { - unsigned old_len = vec_safe_length (label_to_block_map); + unsigned old_len = + vec_safe_length (label_to_block_map_for_fn (cfun)); LABEL_DECL_UID (t) = uid = cfun->cfg->last_label_uid++; if (old_len <= (unsigned) uid) { unsigned new_len = 3 * uid / 2 + 1; - vec_safe_grow_cleared (label_to_block_map, new_len); + vec_safe_grow_cleared (label_to_block_map_for_fn (cfun), + new_len); } } - (*label_to_block_map)[uid] = bb; + (*label_to_block_map_for_fn (cfun))[uid] = bb; } } diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 9558546..f384b04 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -2379,7 +2379,7 @@ stmt_ends_bb_p (gimple t) void delete_tree_cfg_annotations (void) { - vec_free (label_to_block_map); + vec_free (label_to_block_map_for_fn (cfun)); } @@ -4281,7 +4281,8 @@ verify_gimple_label (gimple stmt) uid = LABEL_DECL_UID (decl); if (cfun->cfg - && (uid == -1 || (*label_to_block_map)[uid] != gimple_bb (stmt))) + && (uid == -1 + || (*label_to_block_map_for_fn (cfun))[uid] != gimple_bb (stmt))) { error ("incorrect entry in label_to_block_map"); err |= true;