Commit 3c545f74 by Jakub Jelinek Committed by Jakub Jelinek

re PR tree-optimization/89314 (ICE in wide_int_to_tree_1, at tree.c:1561)

	PR tree-optimization/89314
	* fold-const.c (fold_binary_loc): Cast strlen argument to
	const char * before dereferencing it.  Formatting fixes.

	* gcc.dg/pr89314.c: New test.

From-SVN: r268868
parent 8936f531
2019-02-14 Jakub Jelinek <jakub@redhat.com> 2019-02-14 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/89314
* fold-const.c (fold_binary_loc): Cast strlen argument to
const char * before dereferencing it. Formatting fixes.
PR middle-end/89284 PR middle-end/89284
* passes.def: Swap pass_ubsan and pass_early_warn_uninitialized. * passes.def: Swap pass_ubsan and pass_early_warn_uninitialized.
......
...@@ -10740,20 +10740,24 @@ fold_binary_loc (location_t loc, enum tree_code code, tree type, ...@@ -10740,20 +10740,24 @@ fold_binary_loc (location_t loc, enum tree_code code, tree type,
strlen(ptr) != 0 => *ptr != 0 strlen(ptr) != 0 => *ptr != 0
Other cases should reduce to one of these two (or a constant) Other cases should reduce to one of these two (or a constant)
due to the return value of strlen being unsigned. */ due to the return value of strlen being unsigned. */
if (TREE_CODE (arg0) == CALL_EXPR if (TREE_CODE (arg0) == CALL_EXPR && integer_zerop (arg1))
&& integer_zerop (arg1))
{ {
tree fndecl = get_callee_fndecl (arg0); tree fndecl = get_callee_fndecl (arg0);
if (fndecl if (fndecl
&& fndecl_built_in_p (fndecl, BUILT_IN_STRLEN) && fndecl_built_in_p (fndecl, BUILT_IN_STRLEN)
&& call_expr_nargs (arg0) == 1 && call_expr_nargs (arg0) == 1
&& TREE_CODE (TREE_TYPE (CALL_EXPR_ARG (arg0, 0))) == POINTER_TYPE) && (TREE_CODE (TREE_TYPE (CALL_EXPR_ARG (arg0, 0)))
== POINTER_TYPE))
{ {
tree iref = build_fold_indirect_ref_loc (loc, tree ptrtype
CALL_EXPR_ARG (arg0, 0)); = build_pointer_type (build_qualified_type (char_type_node,
TYPE_QUAL_CONST));
tree ptr = fold_convert_loc (loc, ptrtype,
CALL_EXPR_ARG (arg0, 0));
tree iref = build_fold_indirect_ref_loc (loc, ptr);
return fold_build2_loc (loc, code, type, iref, return fold_build2_loc (loc, code, type, iref,
build_int_cst (TREE_TYPE (iref), 0)); build_int_cst (TREE_TYPE (iref), 0));
} }
} }
......
2019-02-14 Jakub Jelinek <jakub@redhat.com> 2019-02-14 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/89314
* gcc.dg/pr89314.c: New test.
PR middle-end/89284 PR middle-end/89284
* gcc.dg/ubsan/pr89284.c: New test. * gcc.dg/ubsan/pr89284.c: New test.
......
/* PR tree-optimization/89314 */
/* { dg-do compile } */
/* { dg-options "-O2 -Wbuiltin-declaration-mismatch -Wextra" } */
extern __SIZE_TYPE__ strlen (const float *); /* { dg-warning "mismatch in argument 1 type of built-in function" } */
void bar (void);
void
foo (float *s)
{
if (strlen (s) > 0)
bar ();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment