From patchwork Tue Nov 23 05:29:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 48019 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DD68C385840E for ; Tue, 23 Nov 2021 05:30:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD68C385840E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1637645414; bh=nDqdA5IxleIjo+v6oPKnYld4EINGr5WHJ2dVQx+T5p8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=cdfDDzk/rHbNskLt1Ckxe2gZpRgSLUbkfio5F1YYW/u5JHIWyaof6btIOK8TAcFjU xYsTsnW7Dlpjf4ibG1eAuwsQKC/EHoQ5bouOv8IYLJ42OpFZ6lPP4Trzc7Oe0dqs8b BNBymYSCH/3CCoRjsQrBgY8/TW/FPnpGt/dCwVPg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by sourceware.org (Postfix) with ESMTPS id 195903858405 for ; Tue, 23 Nov 2021 05:29:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 195903858405 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AN1Y517030435 for ; Mon, 22 Nov 2021 21:29:44 -0800 Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3cg5m1cvvd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Mon, 22 Nov 2021 21:29:44 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 22 Nov 2021 21:29:42 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 22 Nov 2021 21:29:42 -0800 Received: from linux.wrightpinski.org.com (unknown [10.69.242.198]) by maili.marvell.com (Postfix) with ESMTP id 5043A3F7045; Mon, 22 Nov 2021 21:29:42 -0800 (PST) To: Subject: [PATCH v2] Canonicalize &MEM[ssa_n, CST] to ssa_n p+ CST in fold_stmt_1 Date: Mon, 22 Nov 2021 21:29:38 -0800 Message-ID: <1637645378-8431-1-git-send-email-apinski@marvell.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Proofpoint-GUID: FYYhpl0q27oeDfgRlOknQKlfColfnQax X-Proofpoint-ORIG-GUID: FYYhpl0q27oeDfgRlOknQKlfColfnQax X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-23_01,2021-11-22_02,2020-04-07_01 X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: apinski--- via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: apinski@marvell.com Cc: Andrew Pinski Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Andrew Pinski This is a new version of the patch to fix PR 102216. Instead of doing the canonicalization inside forwprop, Richi mentioned we should do it inside fold_stmt_1 and that is what this patch does. PR tree-optimization/102216 gcc/ChangeLog: * gimple-fold.c (fold_stmt_1): Add canonicalization of "&MEM[ssa_n, CST]" to "ssa_n p+ CST", note this can only be done if !in_place. gcc/testsuite/ChangeLog: * g++.dg/tree-ssa/pr102216-1.C: New test. * g++.dg/tree-ssa/pr102216-2.C: New test. --- gcc/gimple-fold.c | 21 ++++++++++ gcc/testsuite/g++.dg/tree-ssa/pr102216-1.C | 21 ++++++++++ gcc/testsuite/g++.dg/tree-ssa/pr102216-2.C | 45 ++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr102216-1.C create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr102216-2.C diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index ad9703ee471..aab6818c93f 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -6061,6 +6061,27 @@ fold_stmt_1 (gimple_stmt_iterator *gsi, bool inplace, tree (*valueize) (tree)) if (REFERENCE_CLASS_P (*lhs) && maybe_canonicalize_mem_ref_addr (lhs)) changed = true; + /* Canonicalize &MEM[ssa_n, CST] to ssa_n p+ CST. + This cannot be done in maybe_canonicalize_mem_ref_addr + as the gimple now has two operands rather than one. + The same reason why this can't be done in + maybe_canonicalize_mem_ref_addr is the same reason why + this can't be done inplace. */ + if (!inplace && TREE_CODE (*rhs) == ADDR_EXPR) + { + tree inner = TREE_OPERAND (*rhs, 0); + if (TREE_CODE (inner) == MEM_REF + && TREE_CODE (TREE_OPERAND (inner, 0)) == SSA_NAME + && TREE_CODE (TREE_OPERAND (inner, 1)) == INTEGER_CST) + { + tree ptr = TREE_OPERAND (inner, 0); + tree addon = TREE_OPERAND (inner, 1); + addon = fold_convert (sizetype, addon); + gimple_assign_set_rhs_with_ops (gsi, POINTER_PLUS_EXPR, + ptr, addon); + changed = true; + } + } } else { diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr102216-1.C b/gcc/testsuite/g++.dg/tree-ssa/pr102216-1.C new file mode 100644 index 00000000000..21f7f6797ff --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr102216-1.C @@ -0,0 +1,21 @@ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +void link_error (); +void g () +{ + const char **language_names; + + language_names = new const char *[6]; + + const char **language_names_p = language_names; + + language_names_p++; + language_names_p++; + language_names_p++; + + if ( (language_names_p) - (language_names+3) != 0) + link_error(); + delete[] language_names; +} +/* We should have removed the link_error on the gimple level as GCC should + be able to tell that language_names_p is the same as language_names+3. */ +/* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" } } */ diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr102216-2.C b/gcc/testsuite/g++.dg/tree-ssa/pr102216-2.C new file mode 100644 index 00000000000..8d351a9bad0 --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr102216-2.C @@ -0,0 +1,45 @@ +/* { dg-options "-O2 -Wall" } */ +#include + +static inline bool +compare_cstrings (const char *str1, const char *str2) +{ + return str1 < str2; +} + +void +add_set_language_command () +{ + static const char **language_names; + + language_names = new const char *[6]; + + language_names[0] = "auto"; + language_names[1] = "local"; + language_names[2] = "unknown"; + + const char **language_names_p = language_names; + /* language_names_p == &language_names[0]. */ + language_names_p++; + /* language_names_p == &language_names[1]. */ + language_names_p++; + /* language_names_p == &language_names[2]. */ + language_names_p++; + /* language_names_p == &language_names[3]. */ + + const char **sort_begin; + + if (0) + sort_begin = &language_names[3]; + else + sort_begin = language_names_p; + + language_names[3] = ""; + language_names[4] = ""; + language_names[5] = NULL; + + /* There should be no warning associated with this std::sort as + sort_begin != &language_names[5] and GCC should be able to figure + that out. */ + std::sort (sort_begin, &language_names[5], compare_cstrings); +}