From patchwork Mon Oct 26 11:23:02 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: 535850 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 CC689141310 for ; Mon, 26 Oct 2015 22:23:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=PwehoNXR; 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 :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=obiP+F3NNZ5fhEo0g3E9E1nau6bnFfMmd1z3ErqSURfjAoCgVg Nms+RppmvzDoh746mKfPzuV3fCbhK62t09NXG1vgxDi5oDcEkJdMXkIpVtxc7MAk aUplNNCxwDTmhz5ra7CmJhUfkQOFtGsRsDrBpG8h2MaxwGTYkUzBoJqZ8= 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 :from:subject:message-id:date:mime-version:content-type; s= default; bh=FFXCUi/lfwD7ct8O4XVWOo9ukPE=; b=PwehoNXRl9E9qZSWxIcq qzeWue77QbC9w9+32Wah90o+2d1+vs1orxYlJEYJSlwOZsZSdArKkYFUKPDyv/v8 VPDyx4yFj68g33pt3A+nKS38w0pM5XoxHDsqRGbnruaRBWBb22kDMz70xXYeyIdk wqoRs/WwNFudkOUQoc4oeew= Received: (qmail 16567 invoked by alias); 26 Oct 2015 11:23:27 -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 16548 invoked by uid 89); 26 Oct 2015 11:23:26 -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; Mon, 26 Oct 2015 11:23:25 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52408) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Zqfs3-0005UC-At for gcc-patches@gnu.org; Mon, 26 Oct 2015 07:23:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zqfrz-0001c1-T7 for gcc-patches@gnu.org; Mon, 26 Oct 2015 07:23:23 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:38235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqfrz-0001bw-Mw for gcc-patches@gnu.org; Mon, 26 Oct 2015 07:23:19 -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 1Zqfry-00045R-UQ from Tom_deVries@mentor.com ; Mon, 26 Oct 2015 04:23:19 -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; Mon, 26 Oct 2015 11:23:17 +0000 To: "gcc-patches@gnu.org" , Richard Biener From: Tom de Vries Subject: [PATCH, 2/2] Handle recursive restrict pointer in create_variable_info_for_1 Message-ID: <562E0D16.3010400@mentor.com> Date: Mon, 26 Oct 2015 12:23:02 +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 enables recursive restrict handling in create_variable_info_for_1. This allows us to interpret all restricts in a function parameter "int *restrict *restrict *restrict a". This patch is the first step towards implementing a generic fix for PR67742. Bootstrapped and reg-tested on x86_64. OK for trunk? Thanks, - Tom Handle recursive restrict pointer in create_variable_info_for_1 2015-10-26 Tom de Vries * tree-ssa-structalias.c (create_variable_info_for_1): Enable recursive handling of restrict pointers. (make_restrict_var_constraints): Handle restrict vars recursively. * gcc.dg/tree-ssa/restrict-7.c: New test. --- gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c | 12 ++++++++++++ gcc/tree-ssa-structalias.c | 13 +++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c new file mode 100644 index 0000000..f7a68c7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-fre1" } */ + +int +f (int *__restrict__ *__restrict__ *__restrict__ a, int *b) +{ + *b = 1; + ***a = 2; + return *b; +} + +/* { dg-final { scan-tree-dump-times "return 1" 1 "fre1" } } */ diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c index 3fdad3a..3839f67 100644 --- a/gcc/tree-ssa-structalias.c +++ b/gcc/tree-ssa-structalias.c @@ -5696,7 +5696,7 @@ create_variable_info_for_1 (tree decl, const char *name, bool 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 = create_variable_info_for_1 (heapvar, "PARM_NOALIAS", true); rvi->is_restrict_var = 1; insert_vi_for_tree (heapvar, rvi); vi->restrict_pointed_var = rvi->id; @@ -5867,7 +5867,16 @@ make_restrict_var_constraints (varinfo_t vi) if (vi->may_have_pointers) { if (vi->only_restrict_pointers) - make_constraint_from_global_restrict (vi, "GLOBAL_RESTRICT"); + { + varinfo_t rvi = get_varinfo (vi->restrict_pointed_var); + if (rvi != NULL) + { + make_constraint_from (vi, rvi->id); + make_restrict_var_constraints (rvi); + } + else + make_constraint_from_global_restrict (vi, "GLOBAL_RESTRICT"); + } else make_copy_constraint (vi, nonlocal_id); } -- 1.9.1