From c7773e671546a3089837daabc7acf534dc187232 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 17 Jan 2018 12:43:56 +0100 Subject: [PATCH] Subject: Backport r256009 2018-01-17 Martin Liska Backport from mainline 2017-12-27 Martin Liska PR tree-optimization/83552 * tree-ssa-strlen.c (fold_strstr_to_strncmp): Assign result of get_string_lenth to a SSA_NAME if not a GIMPLE value. 2018-01-17 Martin Liska Backport from mainline 2017-12-27 Martin Liska PR tree-optimization/83552 * gcc.dg/pr83552.c: New test. From-SVN: r256786 --- gcc/ChangeLog | 9 +++++++++ gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.dg/pr83552.c | 13 +++++++++++++ gcc/tree-ssa-strlen.c | 10 ++++++++++ 4 files changed, 40 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr83552.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d170efe04c1..42fe9b15dbf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-01-17 Martin Liska + + Backport from mainline + 2017-12-27 Martin Liska + + PR tree-optimization/83552 + * tree-ssa-strlen.c (fold_strstr_to_strncmp): Assign result + of get_string_lenth to a SSA_NAME if not a GIMPLE value. + 2018-01-16 Segher Boessenkool Backport from mainline diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dadc47741c7..4c22beb07aa 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2018-01-17 Martin Liska + + Backport from mainline + 2017-12-27 Martin Liska + + PR tree-optimization/83552 + * gcc.dg/pr83552.c: New test. + 2018-01-16 Eric Botcazou PR testsuite/77734 diff --git a/gcc/testsuite/gcc.dg/pr83552.c b/gcc/testsuite/gcc.dg/pr83552.c new file mode 100644 index 00000000000..993cdd26581 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr83552.c @@ -0,0 +1,13 @@ +/* PR tree-optimization/83364 */ +/* { dg-options "-O2" } */ + +char *b; +char d[100]; +void a (); +void +c (void) +{ + __builtin_strcat (d, "12345"); + if (__builtin_strstr (b, d) == b) + a (); +} diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c index 9c72d122bbe..f9f2fdd68f0 100644 --- a/gcc/tree-ssa-strlen.c +++ b/gcc/tree-ssa-strlen.c @@ -2306,6 +2306,16 @@ fold_strstr_to_strncmp (tree rhs1, tree rhs2, gimple *stmt) { gimple_stmt_iterator gsi = gsi_for_stmt (call_stmt); tree strncmp_decl = builtin_decl_explicit (BUILT_IN_STRNCMP); + + if (!is_gimple_val (arg1_len)) + { + tree arg1_len_tmp = make_ssa_name (TREE_TYPE (arg1_len)); + gassign *arg1_stmt = gimple_build_assign (arg1_len_tmp, + arg1_len); + gsi_insert_before (&gsi, arg1_stmt, GSI_SAME_STMT); + arg1_len = arg1_len_tmp; + } + gcall *strncmp_call = gimple_build_call (strncmp_decl, 3, arg0, arg1, arg1_len); tree strncmp_lhs = make_ssa_name (integer_type_node);