diff options
| author | Martin Liska <mliska@suse.cz> | 2017-12-27 10:30:14 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2017-12-27 09:30:14 +0000 |
| commit | 96863f32b5d83961fc1cb073707f0cf53a475639 (patch) | |
| tree | 6ca82892512f349b1d0537111c13dfffe4e8b50a /gcc | |
| parent | 7ec16b79f003f568a398de192adc8f3e957327fe (diff) | |
| download | gcc-96863f32b5d83961fc1cb073707f0cf53a475639.zip gcc-96863f32b5d83961fc1cb073707f0cf53a475639.tar.gz gcc-96863f32b5d83961fc1cb073707f0cf53a475639.tar.bz2 | |
Assign result of get_string_lenth to a SSA_NAME (PR tree-optimization/83552).
2017-12-27 Martin Liska <mliska@suse.cz>
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.
2017-12-27 Martin Liska <mliska@suse.cz>
PR tree-optimization/83552
* gcc.dg/pr83552.c: New test.
From-SVN: r256009
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr83552.c | 13 | ||||
| -rw-r--r-- | gcc/tree-ssa-strlen.c | 10 |
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d14bd93..5747358 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-12-27 Martin Liska <mliska@suse.cz> + + 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. + 2017-12-27 Tom de Vries <tom@codesourcery.com> * config/nvptx/nvptx.c (nvptx_option_override): Disable diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 14e8e3f..c03e6e1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-12-27 Martin Liska <mliska@suse.cz> + + PR tree-optimization/83552 + * gcc.dg/pr83552.c: New test. + 2017-12-26 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/83540 diff --git a/gcc/testsuite/gcc.dg/pr83552.c b/gcc/testsuite/gcc.dg/pr83552.c new file mode 100644 index 0000000..993cdd2 --- /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 e812bd1..be6ab9f 100644 --- a/gcc/tree-ssa-strlen.c +++ b/gcc/tree-ssa-strlen.c @@ -3005,6 +3005,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); |