mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-11 11:50:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR tree-optimization/87940 (FAIL: gcc.dg/warn-strlen-no-nul.c)

Browse Source 
2018-11-09  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        PR tree-optimization/87940
        * expr.c (string_constant): Don't strip NOPS in subexpressions.
        Fold PLUS_EXPR correctly.

From-SVN: r265992
This commit is contained in:
Bernd Edlinger 2018-11-09 20:38:07 +00:00 committed by Bernd Edlinger
parent 340e0dd664
commit ab386758ef
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2018-11-09 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR tree-optimization/87940
* expr.c (string_constant): Don't strip NOPS in subexpressions.
Fold PLUS_EXPR correctly.
2018-11-09 Ilya Leoshkevich <iii@linux.ibm.com>
PR target/87762

25
gcc/expr.c
View File

@ -11358,18 +11358,15 @@ string_constant (tree arg, tree *ptr_offset, tree *mem_size, tree *decl)
tree arg0 = TREE_OPERAND (arg, 0);
tree arg1 = TREE_OPERAND (arg, 1);
STRIP_NOPS (arg0);
STRIP_NOPS (arg1);
if (TREE_CODE (arg0) == ADDR_EXPR)
; /* Do nothing. */
else if (TREE_CODE (arg1) == ADDR_EXPR)
std::swap (arg0, arg1);
else
return NULL_TREE;
tree offset;
if (tree str = string_constant (arg0, &offset, mem_size, decl))
tree str = string_constant (arg0, &offset, mem_size, decl);
if (!str)
{
str = string_constant (arg1, &offset, mem_size, decl);
arg1 = arg0;
}
if (str)
{
/* Avoid pointers to arrays (see bug 86622). */
if (POINTER_TYPE_P (TREE_TYPE (arg))
@ -11380,7 +11377,8 @@ string_constant (tree arg, tree *ptr_offset, tree *mem_size, tree *decl)
&& tree_int_cst_equal (*mem_size, DECL_SIZE_UNIT (*decl))))
return NULL_TREE;
tree type = TREE_TYPE (arg1);
tree type = TREE_TYPE (offset);
arg1 = fold_convert (type, arg1);
*ptr_offset = fold_build2 (PLUS_EXPR, type, offset, arg1);
return str;
}
@ -11412,7 +11410,8 @@ string_constant (tree arg, tree *ptr_offset, tree *mem_size, tree *decl)
return NULL_TREE;
tree rhs2 = gimple_assign_rhs2 (stmt);
tree type = TREE_TYPE (rhs2);
tree type = TREE_TYPE (offset);
rhs2 = fold_convert (type, rhs2);
*ptr_offset = fold_build2 (PLUS_EXPR, type, offset, rhs2);
return str;
}