From b834435c8fa4cb9424787fe3044a49fef7992de8 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 19 Jan 2022 09:26:13 +0100 Subject: [PATCH] fold-const: Optimize &"foo"[0] == "foo" [PR89074] This is a non-C++ related part from the PR89074 address_compare changes. For "foo" == "foo" we already optimize this from the (cmp @0 @0) simplification, because we use operand_equal_p in that case and operand_equal_p also compares the STRING_CSTs bytes rather than just addresses. 2022-01-19 Jakub Jelinek PR c++/89074 * fold-const.cc (address_compare): Consider different STRING_CSTs with the same lengths that memcmp the same as equal, not different. * gcc.dg/tree-ssa/pr89074.c: New test. --- gcc/fold-const.cc | 9 +++++++++ gcc/testsuite/gcc.dg/tree-ssa/pr89074.c | 12 ++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr89074.c diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc index ff6a749..8fe633c 100644 --- a/gcc/fold-const.cc +++ b/gcc/fold-const.cc @@ -16587,6 +16587,15 @@ address_compare (tree_code code, tree type, tree op0, tree op1, || TREE_CODE (base1) == SSA_NAME || TREE_CODE (base1) == STRING_CST)) equal = (base0 == base1); + /* Assume different STRING_CSTs with the same content will be + merged. */ + if (equal == 0 + && TREE_CODE (base0) == STRING_CST + && TREE_CODE (base1) == STRING_CST + && TREE_STRING_LENGTH (base0) == TREE_STRING_LENGTH (base1) + && memcmp (TREE_STRING_POINTER (base0), TREE_STRING_POINTER (base1), + TREE_STRING_LENGTH (base0)) == 0) + equal = 1; if (equal == 1) { if (code == EQ_EXPR diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr89074.c b/gcc/testsuite/gcc.dg/tree-ssa/pr89074.c new file mode 100644 index 0000000..666dfa7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr89074.c @@ -0,0 +1,12 @@ +/* PR c++/89074 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-optimized" } */ +/* { dg-final { scan-tree-dump "return 1;" "optimized" } } */ + +int +foo (void) +{ + const char *a = &"foo"[0]; + const char *b = "foo"; + return a == b; +} -- 2.7.4