From patchwork Tue Oct 27 07:13:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 536476 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 0E454140D7C for ; Tue, 27 Oct 2015 18:15:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=j/nD+CoO; 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:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=ralcuviSNr0UJjkB1Pi8SJeHPxHBkCh3JJsKxaMWqd8aHxc5QR bW1HSCrGhOfgy0Ld5OAcObwffWtBgRBG0NHNNq2xtJvx4IjjxytnTPfJzQ/o/bG5 4tDGx0KSV9Lsly4D2TuD9cfeob6VU3N2hhB/d99cChX/vg6LN+o+I+srU= 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:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=5Qt+a+Y7KndQ7REwFdMByIuDmhg=; b=j/nD+CoOsZLsmaqblSI0 47m/TEN1iou0DEcIS9UI8serAIIiEbfGheV3N5e41Hp+CoLTjuRVOdbBffi5a/dq 07031H7q59J38ob0MqxI5Oyq7d6Xtyawy5Mn7XYaLKBvD+BtsFR4W1RBokEtysj8 xwc28PZijSCMBSummf21ycU= Received: (qmail 107757 invoked by alias); 27 Oct 2015 07:15:19 -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 107746 invoked by uid 89); 27 Oct 2015 07:15:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 27 Oct 2015 07:15:17 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48102) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZqyTT-0001uj-4x for gcc-patches@gnu.org; Tue, 27 Oct 2015 03:15:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqyTP-0006r6-QQ for gcc-patches@gnu.org; Tue, 27 Oct 2015 03:15:14 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:48573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqyTP-0006r0-L2 for gcc-patches@gnu.org; Tue, 27 Oct 2015 03:15:11 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZqyTO-0002HL-1c from Tom_deVries@mentor.com ; Tue, 27 Oct 2015 00:15:10 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Tue, 27 Oct 2015 07:13:27 +0000 To: "gcc-patches@gnu.org" CC: Richard Biener From: Tom de Vries Subject: [committed] Add var in push_fields_onto_fieldstack Message-ID: <562F2407.6000904@mentor.com> Date: Tue, 27 Oct 2015 08:13:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, this patch adds a new variable in push_fields_onto_fieldstack, improving readability. Bootstrapped and reg-tested on x86_64. Committed to trunk as obvious. Thanks, - Tom Add var in push_fields_onto_fieldstack 2015-10-27 Tom de Vries * tree-ssa-structalias.c (push_fields_onto_fieldstack): Add and use var field_type. --- gcc/tree-ssa-structalias.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 8d86dcb..9632ce1 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -5313,13 +5313,14 @@ push_fields_onto_fieldstack (tree type, vec *fieldstack, { bool push = false; HOST_WIDE_INT foff = bitpos_of_field (field); + tree field_type = TREE_TYPE (field); if (!var_can_have_subvars (field) - || TREE_CODE (TREE_TYPE (field)) == QUAL_UNION_TYPE - || TREE_CODE (TREE_TYPE (field)) == UNION_TYPE) + || TREE_CODE (field_type) == QUAL_UNION_TYPE + || TREE_CODE (field_type) == UNION_TYPE) push = true; else if (!push_fields_onto_fieldstack - (TREE_TYPE (field), fieldstack, offset + foff) + (field_type, fieldstack, offset + foff) && (DECL_SIZE (field) && !integer_zerop (DECL_SIZE (field)))) /* Empty structures may have actual size, like in C++. So @@ -5372,8 +5373,8 @@ push_fields_onto_fieldstack (tree type, vec *fieldstack, e.may_have_pointers = true; e.only_restrict_pointers = (!has_unknown_size - && POINTER_TYPE_P (TREE_TYPE (field)) - && TYPE_RESTRICT (TREE_TYPE (field))); + && POINTER_TYPE_P (field_type) + && TYPE_RESTRICT (field_type)); fieldstack->safe_push (e); } } -- 1.9.1