This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Fix host_size_t_cst_p predicate
- From: Martin Liška <mliska at suse dot cz>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Thu, 27 Oct 2016 09:41:35 +0200
- Subject: [PATCH] Fix host_size_t_cst_p predicate
- Authentication-results: sourceware.org; auth=none
Running simple test-case w/o the proper header file causes ICE:
strncmp ("a", "b", -1);
0xe74462 tree_to_uhwi(tree_node const*)
../../gcc/tree.c:7324
0x90a23f host_size_t_cst_p
../../gcc/fold-const-call.c:63
0x90a23f fold_const_call(combined_fn, tree_node*, tree_node*, tree_node*, tree_node*)
../../gcc/fold-const-call.c:1512
0x787b01 fold_builtin_3
../../gcc/builtins.c:8385
0x787b01 fold_builtin_n(unsigned int, tree_node*, tree_node**, int, bool)
../../gcc/builtins.c:8465
0x9052b1 fold(tree_node*)
../../gcc/fold-const.c:11919
0x6de2bb c_fully_fold_internal
../../gcc/c/c-fold.c:185
0x6e1f6b c_fully_fold(tree_node*, bool, bool*)
../../gcc/c/c-fold.c:90
0x67cbbf c_process_expr_stmt(unsigned int, tree_node*)
../../gcc/c/c-typeck.c:10369
0x67cfbd c_finish_expr_stmt(unsigned int, tree_node*)
../../gcc/c/c-typeck.c:10414
0x6cb578 c_parser_statement_after_labels
../../gcc/c/c-parser.c:5430
0x6cd333 c_parser_compound_statement_nostart
../../gcc/c/c-parser.c:4944
0x6cdbde c_parser_compound_statement
../../gcc/c/c-parser.c:4777
0x6c93ac c_parser_declaration_or_fndef
../../gcc/c/c-parser.c:2176
0x6d51ab c_parser_external_declaration
../../gcc/c/c-parser.c:1574
0x6d5c09 c_parser_translation_unit
../../gcc/c/c-parser.c:1454
0x6d5c09 c_parse_file()
../../gcc/c/c-parser.c:18173
0x72ffd2 c_common_parse_file()
../../gcc/c-family/c-opts.c:1087
Following patch improves the host_size_t_cst_p predicate.
Patch can bootstrap on ppc64le-redhat-linux and survives regression tests.
Ready to be installed?
Martin
>From 839da4bfdb9505d9f7893c9d22003f93736b9582 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Wed, 26 Oct 2016 13:48:39 +0200
Subject: [PATCH] Fix host_size_t_cst_p predicat
gcc/ChangeLog:
2016-10-26 Martin Liska <mliska@suse.cz>
* fold-const-call.c (host_size_t_cst_p): Test whether
it can fit to uhwi.
gcc/testsuite/ChangeLog:
2016-10-26 Martin Liska <mliska@suse.cz>
* gcc.dg/tree-ssa/builtins-folding-gimple-ub.c (main): Add
test case.
---
gcc/fold-const-call.c | 3 ++-
gcc/testsuite/gcc.dg/tree-ssa/builtins-folding-gimple-ub.c | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/gcc/fold-const-call.c b/gcc/fold-const-call.c
index 05a15f9..fce9976 100644
--- a/gcc/fold-const-call.c
+++ b/gcc/fold-const-call.c
@@ -58,7 +58,8 @@ static inline bool
host_size_t_cst_p (tree t, size_t *size_out)
{
if (integer_cst_p (t)
- && wi::min_precision (t, UNSIGNED) <= sizeof (size_t) * CHAR_BIT)
+ && wi::min_precision (t, UNSIGNED) <= sizeof (size_t) * CHAR_BIT
+ && tree_fits_uhwi_p (t))
{
*size_out = tree_to_uhwi (t);
return true;
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 df0ede2..e1658d1 100644
--- 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;
}
--
2.10.1