From patchwork Tue Oct 27 13:04:23 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: 536616 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 1F64C141352 for ; Wed, 28 Oct 2015 00:05:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=rEi6Ubrc; 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=n7c291Wm0duUQFkeL xzmqsKu6Qt1yfF8etQ1Bjd7filywNxjLWgxRspwBOOkrnpMQVXiPw/gX2bkpRXS5 ENaryhSfBvlHgGayAi1WVOQnWDpKTaRnkmvUIjCJnSyTEf/X9vtLY6E52W+mMlOb nPJTvD6G+lekbIg1YAEstbomrw= 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=nLiotx2uMYsDycA5i0qHlFi 3vSE=; b=rEi6Ubrcsafd5KOmLGEW3c+bVPWRu2zORxv6AC8E9o7fMBKdms+3HBh pDc3KoMg7YT/TrDviAwRRhfhpf/fWQTTYNvRmkoVg+a/1lDzZsiWi0KaZoJ4ISdB 5KA57l44/SN4py8/kRBd3ZIttm6yqMSzP0sdCTF6EeZgpog9iIPU= Received: (qmail 98395 invoked by alias); 27 Oct 2015 13:04:56 -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 98376 invoked by uid 89); 27 Oct 2015 13:04:55 -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 13:04:52 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57194) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Zr3vl-0000h4-T4 for gcc-patches@gnu.org; Tue, 27 Oct 2015 09:04:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zr3vf-0005Ud-Ub for gcc-patches@gnu.org; Tue, 27 Oct 2015 09:04:49 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:64799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr3vf-0005UW-LW for gcc-patches@gnu.org; Tue, 27 Oct 2015 09:04:43 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Zr3vd-0006bT-M8 from Tom_deVries@mentor.com ; Tue, 27 Oct 2015 06:04:42 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Tue, 27 Oct 2015 13:04:40 +0000 Subject: [PATCH, 4/6] Add handle_param parameter to create_variable_info_for_1 To: Richard Biener References: <562E0CF5.8000606@mentor.com> <562E5381.5@mentor.com> <562F26E2.40906@mentor.com> <562F6D1A.4010001@mentor.com> CC: Richard Biener , "gcc-patches@gnu.org" From: Tom de Vries Message-ID: <562F7657.7000508@mentor.com> Date: Tue, 27 Oct 2015 14:04:23 +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: <562F6D1A.4010001@mentor.com> X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 On 27/10/15 13:24, Tom de Vries wrote: it over a bit more, I realized the constraint handling started > to be messy. I've reworked the patch series to simplify that first. > > 1 Simplify constraint handling > 2 Rename make_restrict_var_constraints to make_param_constraints > 3 Add recursion to make_param_constraints > 4 Add handle_param parameter to create_variable_info_for_1 > 5 Handle recursive restrict pointer in create_variable_info_for_1 > 6 Handle restrict struct fields recursively > > Currently doing bootstrap and regtest on x86_64. > > I'll repost the patch series in reply to this message. A repost of the patch at https://gcc.gnu.org/ml/gcc-patches/2015-10/msg02776.html . I've changed the structure a bit such that it's clear that the remaining 'build_fake_var_decl' bit is in 'the lookup_vi_for_tree (t) != NULL' branch. Thanks, - Tom Add handle_param parameter to create_variable_info_for_1 2015-10-26 Tom de Vries * tree-ssa-structalias.c (create_variable_info_for_1): Add and handle handle_param parameter. (create_variable_info_for): Call create_variable_info_for_1 with extra arg. (intra_create_variable_infos): Same. Handle case that lookup_restrict_pointed_var (p) is not NULL. --- gcc/tree-ssa-structalias.c | 53 ++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 93bc325..a639944 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -5642,10 +5642,10 @@ lookup_restrict_pointed_var (varinfo_t vi) /* Create a varinfo structure for NAME and DECL, and add it to VARMAP. This will also create any varinfo structures necessary for fields - of DECL. */ + of DECL. DECL is a function parameter if HANDLE_PARAM is set. */ static varinfo_t -create_variable_info_for_1 (tree decl, const char *name) +create_variable_info_for_1 (tree decl, const char *name, bool handle_param) { varinfo_t vi, newvi; tree decl_type = TREE_TYPE (decl); @@ -5721,6 +5721,18 @@ create_variable_info_for_1 (tree decl, const char *name) if (POINTER_TYPE_P (TREE_TYPE (decl)) && TYPE_RESTRICT (TREE_TYPE (decl))) vi->only_restrict_pointers = 1; + if (vi->only_restrict_pointers + && !type_contains_placeholder_p (TREE_TYPE (TREE_TYPE (decl))) + && handle_param) + { + varinfo_t rvi; + tree heapvar = build_fake_var_decl (TREE_TYPE (decl_type)); + DECL_EXTERNAL (heapvar) = 1; + rvi = create_variable_info_for_1 (heapvar, "PARM_NOALIAS", false); + rvi->is_restrict_var = 1; + insert_vi_for_tree (heapvar, rvi); + insert_restrict_pointed_var (vi, rvi); + } fieldstack.release (); return vi; } @@ -5772,7 +5784,7 @@ create_variable_info_for_1 (tree decl, const char *name) static unsigned int create_variable_info_for (tree decl, const char *name) { - varinfo_t vi = create_variable_info_for_1 (decl, name); + varinfo_t vi = create_variable_info_for_1 (decl, name, false); unsigned int id = vi->id; insert_vi_for_tree (decl, vi); @@ -5925,31 +5937,30 @@ intra_create_variable_infos (struct function *fn) { bool restrict_pointer_p = (POINTER_TYPE_P (TREE_TYPE (t)) && TYPE_RESTRICT (TREE_TYPE (t))); - bool recursive_restrict_p - = (restrict_pointer_p - && !type_contains_placeholder_p (TREE_TYPE (TREE_TYPE (t)))); varinfo_t p = lookup_vi_for_tree (t); if (p == NULL) { - p = create_variable_info_for_1 (t, alias_get_name (t)); + p = create_variable_info_for_1 (t, alias_get_name (t), true); insert_vi_for_tree (t, p); } else if (restrict_pointer_p) - p->only_restrict_pointers = 1; - - /* For restrict qualified pointers build a representative for - the pointed-to object. Note that this ends up handling - out-of-bound references conservatively by aggregating them - in the first/last subfield of the object. */ - if (recursive_restrict_p) { - varinfo_t vi; - tree heapvar = build_fake_var_decl (TREE_TYPE (TREE_TYPE (t))); - DECL_EXTERNAL (heapvar) = 1; - vi = create_variable_info_for_1 (heapvar, "PARM_NOALIAS"); - vi->is_restrict_var = 1; - insert_vi_for_tree (heapvar, vi); - insert_restrict_pointed_var (p, vi); + p->only_restrict_pointers = 1; + + /* For restrict qualified pointers build a representative for + the pointed-to object. Note that this ends up handling + out-of-bound references conservatively by aggregating them + in the first/last subfield of the object. */ + if (!type_contains_placeholder_p (TREE_TYPE (TREE_TYPE (t)))) + { + tree heapvar = build_fake_var_decl (TREE_TYPE (TREE_TYPE (t))); + DECL_EXTERNAL (heapvar) = 1; + varinfo_t vi + = create_variable_info_for_1 (heapvar, "PARM_NOALIAS", false); + vi->is_restrict_var = 1; + insert_vi_for_tree (heapvar, vi); + insert_restrict_pointed_var (p, vi); + } } make_param_constraints (p, true); -- 1.9.1