Fix host_size_t_cst_p predicat

	* fold-const-call.c (host_size_t_cst_p): Test whether
	t is convertible to size_t.
	* gcc.dg/tree-ssa/builtins-folding-gimple-ub.c (main): Add
	test case.

From-SVN: r241780

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba76566850df5c696bcb9ddc7c033808b4b6d832..1b74bd2f6865d0f5a412b4672778d95b470e8ce9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-02  Martin Liska  <mliska@suse.cz>
+
+       * fold-const-call.c (host_size_t_cst_p): Test whether
+       t is convertible to size_t.
+
 2016-11-02  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        PR tree-optimization/78170

diff --git a/gcc/fold-const-call.c b/gcc/fold-const-call.c
index 05a15f974e94d9206c0f026c8e8d5a15f26b74f4..1b3a755df3438f9f2c1d8dc2e6ba5c31192811c1 100644 (file)
--- a/gcc/fold-const-call.c
+++ b/gcc/fold-const-call.c
@@ -29,6 +29,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "case-cfn-macros.h"
 #include "tm.h" /* For C[LT]Z_DEFINED_AT_ZERO.  */
 #include "builtins.h"
+#include "gimple-expr.h"
 
 /* Functions that test for certain constant types, abstracting away the
    decision about whether to check for overflow.  */
@@ -57,7 +58,8 @@ complex_cst_p (tree t)
 static inline bool
 host_size_t_cst_p (tree t, size_t *size_out)
 {
-  if (integer_cst_p (t)
+  if (types_compatible_p (size_type_node, TREE_TYPE (t))
+      && integer_cst_p (t)
       && wi::min_precision (t, UNSIGNED) <= sizeof (size_t) * CHAR_BIT)
     {
       *size_out = tree_to_uhwi (t);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c06c315821e252aad96778856dfc8234cbd20f5e..38668b74c8b260328cf46d92839ba73437038f99 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-02  Martin Liska  <mliska@suse.cz>
+
+       * gcc.dg/tree-ssa/builtins-folding-gimple-ub.c (main): Add
+       test case.
+
 2016-11-02  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        PR tree-optimization/78170

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c b/gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c
index df0ede2ba5e0e8b9bd3b1d3d44116b56d4ad0947..e1658d183c36b08a3387870d93c184c937e609f6 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c
@@ -17,6 +17,10 @@ main (void)
   if (__builtin_memchr (foo1, 'x', 1000)) /* Not folded away.  */
     __builtin_abort ();
 
+  /* STRNCMP.  */
+  if (strncmp ("a", "b", -1)) /* { dg-warning "implicit declaration of function" } */
+    __builtin_abort ();
+
   return 0;
 }