OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix folding of memcmp("a", "a", 2) (PR 

* fold-const-call.c (fold_const_call): Fix the folding.
	* gcc.dg/tree-ssa/builtins-folding-generic.c (main): Add new
	test-case for memcmp.
	* gcc.dg/tree-ssa/builtins-folding-gimple.c: Likewise.

From-SVN: r242000
This commit is contained in:
Martin Liska 2016-11-09 15:07:32 +01:00 committed by Martin Liska
parent 6fa161dc80
commit 68c937083c
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ChangeLog
View File

@ -1,3 +1,7 @@
2016-11-09 Martin Liska <mliska@suse.cz>
* fold-const-call.c (fold_const_call): Fix the folding.
2016-11-09 Richard Biener <rguenther@suse.de>
* common.opt (flag_evaluation_order): Remove.

10
gcc/fold-const-call.c
View File

@ -1506,7 +1506,7 @@ tree
fold_const_call (combined_fn fn, tree type, tree arg0, tree arg1, tree arg2)
{
const char *p0, *p1;
size_t s2 = 0;
size_t s0, s1, s2 = 0;
switch (fn)
{
case CFN_BUILT_IN_STRNCMP:
@ -1538,11 +1538,11 @@ fold_const_call (combined_fn fn, tree type, tree arg0, tree arg1, tree arg2)
}
case CFN_BUILT_IN_BCMP:
case CFN_BUILT_IN_MEMCMP:
if ((p0 = c_getstr (arg0))
&& (p1 = c_getstr (arg1))
if ((p0 = c_getstr (arg0, &s0))
&& (p1 = c_getstr (arg1, &s1))
&& host_size_t_cst_p (arg2, &s2)
&& s2 <= strlen (p0)
&& s2 <= strlen (p1))
&& s2 <= s0
&& s2 <= s1)
return build_cmp_result (type, memcmp (p0, p1, s2));
return NULL_TREE;

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2016-11-09 Martin Liska <mliska@suse.cz>
* gcc.dg/tree-ssa/builtins-folding-generic.c (main): Add new
test-case for memcmp.
* gcc.dg/tree-ssa/builtins-folding-gimple.c: Likewise.
2016-11-09 Thomas Preud'homme <thomas.preudhomme@arm.com>
PR testsuite/78269

5
gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-generic.c
View File

@ -66,6 +66,10 @@ main (void)
if (__builtin_strncasecmp ("aab", "aac", 2) != 0)
__builtin_abort ();
/* MEMCMP. */
if (__builtin_memcmp ("aaaaa", "aaaaa", 6) != 0)
__builtin_abort ();
return 0;
}
@ -74,3 +78,4 @@ main (void)
/* { dg-final { scan-tree-dump-not "__builtin_strncmp" "original" } } */
/* { dg-final { scan-tree-dump-not "__builtin_strncasecmp" "original" } } */
/* { dg-final { scan-tree-dump-not "__builtin_memchr" "original" } } */
/* { dg-final { scan-tree-dump-not "__builtin_memcmp" "original" } } */

6
gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple.c
View File

@ -63,6 +63,7 @@ main (void)
const char *aaaaa = "aaaaa";
const char *hello = "hello";
const char *hello2 = "hello";
const char *empty = "";
const char *ab = "ab";
const char *ba = "ba";
@ -151,6 +152,10 @@ main (void)
if (__builtin_strncasecmp (++s2, ++s3+2, 0) != 0 || s2 != s1+1 || s3 != s1+5)
__builtin_abort();
/* MEMCMP. */
if (__builtin_memcmp (hello, hello2, 6) != 0)
__builtin_abort ();
return 0;
}
@ -158,4 +163,5 @@ main (void)
/* { dg-final { scan-tree-dump-not "__builtin_strcasecmp" "optimized" } } */
/* { dg-final { scan-tree-dump-not "__builtin_strncmp" "optimized" } } */
/* { dg-final { scan-tree-dump-not "__builtin_memchr" "optimized" } } */
/* { dg-final { scan-tree-dump-not "__builtin_memcmp" "optimized" } } */
/* { dg-final { scan-tree-dump-times "__builtin_strncasecmp" 3 "optimized" } } */