From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 4A879385737C; Mon, 17 Oct 2022 13:10:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A879385737C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666012244; bh=DpSiUp+23Rk7aTubeWB6YaqZrMNBZ5exXwr7ous3L/k=; h=From:To:Subject:Date:From; b=FgR887BwwPC4R17+EWBHYpL3hwC7qmsxI/XH2Kc5EYN51H71hHKZBRJzvd71w2Un7 /w2tnUFDkS1g+xg2Zsf/DX8L0UetrFHe8ae8oPH19HVF/yRW7UcXMt8N9cp3zssOTM aMWW2rEXQPNa0pO8wmLyrpVEJZZwlGE4siNuN90U= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-8838] tree-optimization/107107 - tail-merging VN wrong-code X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: b9f58edfc2ccb0fb3840751a2fb4268ce5dd9b3d X-Git-Newrev: ff0a274e5c3026b105c7f51126fa51f8178fa42c Message-Id: <20221017131044.4A879385737C@sourceware.org> Date: Mon, 17 Oct 2022 13:10:44 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ff0a274e5c3026b105c7f51126fa51f8178fa42c commit r12-8838-gff0a274e5c3026b105c7f51126fa51f8178fa42c Author: Richard Biener Date: Thu Oct 6 11:20:16 2022 +0200 tree-optimization/107107 - tail-merging VN wrong-code The following fixes an unintended(?) side-effect of the special MODIFY_EXPR expression entries we add for tail-merging during VN. We shouldn't value-number the virtual operand differently here. PR tree-optimization/107107 * tree-ssa-sccvn.cc (visit_reference_op_store): Do not affect value-numbering when doing the tail merging MODIFY_EXPR lookup. * gcc.dg/pr107107.c: New testcase. (cherry picked from commit 85333b9265720fc4e49397301cb16324d2b89aa7) Diff: --- gcc/testsuite/gcc.dg/pr107107.c | 25 +++++++++++++++++++++++++ gcc/tree-ssa-sccvn.cc | 17 +++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/gcc/testsuite/gcc.dg/pr107107.c b/gcc/testsuite/gcc.dg/pr107107.c new file mode 100644 index 00000000000..5ad6a63159e --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr107107.c @@ -0,0 +1,25 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -ftree-tail-merge" } */ + +static inline void set_longish(int is_long_long, void *p, long x) +{ + if (is_long_long) + *(long long*)p = x; + else + *(long*)p = x; +} +static long test(long long *p, int index, int mode) +{ + *p = 1; + set_longish(mode, p+index, 2); + return *p; +} +long (*volatile vtest)(long long*, int, int) = test; +int main(void) +{ + long long x; + long result = vtest(&x, 0, 1); + if (result != 2 || x != 2) + __builtin_abort (); + return 0; +} diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index 854c0c25bc7..a63f5c8c307 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -5490,19 +5490,6 @@ visit_reference_op_store (tree lhs, tree op, gimple *stmt) if (!resultsame) { - /* Only perform the following when being called from PRE - which embeds tail merging. */ - if (default_vn_walk_kind == VN_WALK) - { - assign = build2 (MODIFY_EXPR, TREE_TYPE (lhs), lhs, op); - vn_reference_lookup (assign, vuse, VN_NOWALK, &vnresult, false); - if (vnresult) - { - VN_INFO (vdef)->visited = true; - return set_ssa_val_to (vdef, vnresult->result_vdef); - } - } - if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "No store match\n"); @@ -5527,7 +5514,9 @@ visit_reference_op_store (tree lhs, tree op, gimple *stmt) if (default_vn_walk_kind == VN_WALK) { assign = build2 (MODIFY_EXPR, TREE_TYPE (lhs), lhs, op); - vn_reference_insert (assign, lhs, vuse, vdef); + vn_reference_lookup (assign, vuse, VN_NOWALK, &vnresult, false); + if (!vnresult) + vn_reference_insert (assign, lhs, vuse, vdef); } } else