From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14027 invoked by alias); 27 Oct 2011 23:30:21 -0000 Received: (qmail 13662 invoked by uid 22791); 27 Oct 2011 23:30:18 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp25.services.sfr.fr (HELO smtp25.services.sfr.fr) (93.17.128.120) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 27 Oct 2011 23:30:05 +0000 Received: from filter.sfr.fr (localhost [127.0.0.1]) by msfrf2512.sfr.fr (SMTP Server) with ESMTP id 368BD7000059; Fri, 28 Oct 2011 01:30:04 +0200 (CEST) Received: from gimli.local (145.15.72.86.rev.sfr.net [86.72.15.145]) by msfrf2512.sfr.fr (SMTP Server) with ESMTP id F16267000055; Fri, 28 Oct 2011 01:30:03 +0200 (CEST) X-SFR-UUID: 20111027233003988.F16267000055@msfrf2512.sfr.fr Content-Type: multipart/mixed; boundary="===============4689268172130340920==" MIME-Version: 1.0 From: Mikael Morin To: gfortran , GCC patches Message-ID: <20111027233003.18581.60947@gimli.local> In-Reply-To: <20111027232947.18581.48982@gimli.local> References: <20111027232818.18581.901@gimli.local> <20111027232947.18581.48982@gimli.local> Subject: [Patch, fortran] [15/66] inline sum and product: Interfaces changes: obtain name more simply Date: Thu, 27 Oct 2011 23:32:00 -0000 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-10/txt/msg02535.txt.bz2 --===============4689268172130340920== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-length: 132 This is a follow-up to the previous patch. It symplifies name obtention so that later we can change structs with less pain. :-) OK? --===============4689268172130340920== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pr43829-15.CL" Content-length: 126 2011-10-19 Mikael Morin * trans-array.c (gfc_trans_array_bound_check): Use ss argument to get name. --===============4689268172130340920== Content-Type: text/x-diff; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pr43829-15.patch" Content-length: 1277 diff --git a/trans-array.c b/trans-array.c index 45bf683..d8f5448 100644 --- a/trans-array.c +++ b/trans-array.c @@ -2443,28 +2443,8 @@ trans_array_bound_check (gfc_se * se, gfc_ss *ss, tree index, int n, index = gfc_evaluate_now (index, &se->pre); /* We find a name for the error message. */ - if (se->ss) - name = se->ss->expr->symtree->name; - - if (!name && se->loop && se->loop->ss && se->loop->ss->expr - && se->loop->ss->expr->symtree) - name = se->loop->ss->expr->symtree->name; - - if (!name && se->loop && se->loop->ss && se->loop->ss->loop_chain - && se->loop->ss->loop_chain->expr - && se->loop->ss->loop_chain->expr->symtree) - name = se->loop->ss->loop_chain->expr->symtree->name; - - if (!name && se->loop && se->loop->ss && se->loop->ss->expr) - { - if (se->loop->ss->expr->expr_type == EXPR_FUNCTION - && se->loop->ss->expr->value.function.name) - name = se->loop->ss->expr->value.function.name; - else - if (se->loop->ss->type == GFC_SS_CONSTRUCTOR - || se->loop->ss->type == GFC_SS_SCALAR) - name = "unnamed constant"; - } + name = ss->expr->symtree->n.sym->name; + gcc_assert (name != NULL); if (TREE_CODE (descriptor) == VAR_DECL) name = IDENTIFIER_POINTER (DECL_NAME (descriptor)); --===============4689268172130340920==--