From patchwork Sun Nov 1 18:12:46 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: 538804 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 8F95B1402DD for ; Mon, 2 Nov 2015 05:13:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=oqfYy7tj; 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 :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=dsyOfxURxa6Srl1d1 +VUcohQP1cVYMFkpay3DwTQyIT+jjkY4ehPAslHF6F1dBW37XwktllO9fkMrtfCX fHw0A2QtCy1TZf3/mFZETay36j+fplqiWIMMKHj1x1qcf4K4TWrV0dZorXv57U/a icQ8SQlLluFtZorcmZYj6k2QNs= 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 :subject:to:references:cc:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=XM7Bb4diD+hJeI1JG5ddtcY e8Wc=; b=oqfYy7tjJY+Ff5fVVRmHayBLoQJZpPaUS2kHcEhyeEy2HRwy1ht7DBf k/TcOqEKExlPUhu2oEkKmgMYC0r8oaMWVSKbJ1z/Nh/MT5GRY1eoqJGEo+bf+TPB NjlzNc45IP5DHp2tipWaN4anZ7NGyjODNV4/RAQS9auNf+baO38M= Received: (qmail 56625 invoked by alias); 1 Nov 2015 18:13:10 -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 56608 invoked by uid 89); 1 Nov 2015 18:13:09 -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, SPF_PASS, T_RP_MATCHES_RCVD 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; Sun, 01 Nov 2015 18:13:08 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51479) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Zsx7p-0005kp-G9 for gcc-patches@gnu.org; Sun, 01 Nov 2015 13:13:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zsx7j-0007DX-PW for gcc-patches@gnu.org; Sun, 01 Nov 2015 13:13:04 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:54952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zsx7j-0007DT-JU for gcc-patches@gnu.org; Sun, 01 Nov 2015 13:12:59 -0500 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 1Zsx7i-0000I5-HM from Tom_deVries@mentor.com ; Sun, 01 Nov 2015 10:12:58 -0800 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; Sun, 1 Nov 2015 18:12:56 +0000 Subject: Re: [PATCH, 3/6] Add recursion to make_param_constraints To: Richard Biener References: <562E0CF5.8000606@mentor.com> <562E5381.5@mentor.com> <562F26E2.40906@mentor.com> <562F6D1A.4010001@mentor.com> <562F748D.5020507@mentor.com> <563653F5.9090302@mentor.com> CC: Richard Biener , "gcc-patches@gnu.org" From: Tom de Vries Message-ID: <5636561E.2030200@mentor.com> Date: Sun, 1 Nov 2015 19:12:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <563653F5.9090302@mentor.com> X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 On 01/11/15 19:03, Tom de Vries wrote: > > So, the new patch series is: > > 1 Rename make_restrict_var_constraints to make_param_constraints > 2 Handle recursive restrict in function parameter > > I'll repost in reply to this message. This no-functional-changes patch: - moves the one constraint handling loop left in intra_create_variable_infos to make_restrict_var_constraints - renames make_restrict_var_constraints to make_param_constraints - adds a parameter toplevel to make_param_constraints to distinguish between the two calling contexts - adds a parmeter restrict_name that allows to pass in the name of restrict vars This patch was posted before at https://gcc.gnu.org/ml/gcc-patches/2015-10/msg03111.html . Thanks, - Tom Rename make_restrict_var_constraints to make_param_constraints 2015-10-27 Tom de Vries * tree-ssa-structalias.c (make_restrict_var_constraints): Rename to ... (make_param_constraints): ... this. Add toplevel and restrict_name parameter. (intra_create_variable_infos): Use make_param_constraints. --- gcc/tree-ssa-structalias.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index d409727..ea34764 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -5892,19 +5892,28 @@ debug_solution_for_var (unsigned int var) dump_solution_for_var (stderr, var); } -/* Register the constraints for restrict var VI. */ +/* Register the constraints for VI. If TOPLEVEL then VI is a function + parameter, otherwise VI is part of a function parameter. Use RESTRICT_NAME + as the base name of created restrict vars. */ static void -make_restrict_var_constraints (varinfo_t vi) +make_param_constraints (varinfo_t vi, bool toplevel, const char *restrict_name) { for (; vi; vi = vi_next (vi)) - if (vi->may_have_pointers) - { - if (vi->only_restrict_pointers) - make_constraint_from_global_restrict (vi, "GLOBAL_RESTRICT", true); - else - make_copy_constraint (vi, nonlocal_id); - } + { + if (vi->only_restrict_pointers) + make_constraint_from_global_restrict (vi, restrict_name, true); + else if (vi->may_have_pointers) + { + if (toplevel) + make_constraint_from (vi, nonlocal_id); + else + make_copy_constraint (vi, nonlocal_id); + } + + if (vi->is_full_var) + break; + } } /* Create varinfo structures for all of the variables in the @@ -5941,19 +5950,11 @@ intra_create_variable_infos (struct function *fn) vi->is_restrict_var = 1; insert_vi_for_tree (heapvar, vi); make_constraint_from (p, vi->id); - make_restrict_var_constraints (vi); + make_param_constraints (vi, false, "GLOBAL_RESTRICT"); continue; } - for (; p; p = vi_next (p)) - { - if (p->only_restrict_pointers) - make_constraint_from_global_restrict (p, "PARM_RESTRICT", true); - else if (p->may_have_pointers) - make_constraint_from (p, nonlocal_id); - if (p->is_full_var) - break; - } + make_param_constraints (p, true, "PARM_RESTRICT"); } /* Add a constraint for a result decl that is passed by reference. */ -- 1.9.1