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

re PR tree-optimization/44508 (libgomp.fortran/vla1.f90 ICE on s390) 

PR tree-optimization/44508
	* tree-ssa-propagate.h (substitute_and_fold): Add DO_DCE
	argument.
	* tree-ssa-propagate.c (substitute_and_fold): If !DO_DCE,
	don't eliminate trivially dead stmts.
	* tree-vrp.c (vrp_finalize): Pass false as last argument
	to substitute_and_fold.
	* tree-ssa-copy.c (fini_copy_prop): Pass true as last argument
	to substitute_and_fold.
	* tree-ssa-ccp.c (ccp_finalize): Likewise.

	* gcc.dg/tree-ssa/pr21086.c: Adjust.

From-SVN: r160749
This commit is contained in:
Jakub Jelinek 2010-06-14 17:19:04 +02:00 committed by Jakub Jelinek
parent 7cec010e49
commit 8ab7d796d8
8 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,5 +1,16 @@
2010-06-14 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/44508
* tree-ssa-propagate.h (substitute_and_fold): Add DO_DCE
argument.
* tree-ssa-propagate.c (substitute_and_fold): If !DO_DCE,
don't eliminate trivially dead stmts.
* tree-vrp.c (vrp_finalize): Pass false as last argument
to substitute_and_fold.
* tree-ssa-copy.c (fini_copy_prop): Pass true as last argument
to substitute_and_fold.
* tree-ssa-ccp.c (ccp_finalize): Likewise.
PR bootstrap/44509
* c-config-lang.in (gtfiles): Add c-family/c-cppbuiltin.c.
* c-family/c-cppbuiltin.c: Include gt-c-family-c-cppbuiltin.h.

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2010-06-14 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/44508
* gcc.dg/tree-ssa/pr21086.c: Adjust.
PR bootstrap/44509
* gcc.dg/pr44509.c: New test.

9
gcc/testsuite/gcc.dg/tree-ssa/pr21086.c
View File

@ -1,5 +1,5 @@
/* { dg-do compile } */
/* { dg-options "-O2 -fdump-tree-vrp1" } */
/* { dg-options "-O2 -fdump-tree-vrp1 -fdump-tree-dce1" } */
int
foo (int *p)
@ -16,8 +16,9 @@ foo (int *p)
}
/* Target with fno-delete-null-pointer-checks should not fold checks */
/* { dg-final { scan-tree-dump-times "Folding predicate " 1 "vrp1" { target { ! keeps_null_pointer_checks } } } } */
/* { dg-final { scan-tree-dump "Folding predicate " "vrp1" { target { ! keeps_null_pointer_checks } } } } */
/* { dg-final { scan-tree-dump-times "Folding predicate " 0 "vrp1" { target { keeps_null_pointer_checks } } } } */
/* { dg-final { scan-tree-dump-not "b_. =" "vrp1" { target { ! avr-*-* } } } } */
/* { dg-final { scan-tree-dump "b_. =" "vrp1" { target { avr-*-* } } } } */
/* { dg-final { scan-tree-dump-not "b_. =" "dce1" { target { ! avr-*-* } } } } */
/* { dg-final { scan-tree-dump "b_. =" "dce1" { target { avr-*-* } } } } */
/* { dg-final { cleanup-tree-dump "vrp1" } } */
/* { dg-final { cleanup-tree-dump "dce1" } } */

2
gcc/tree-ssa-ccp.c
View File

@ -682,7 +682,7 @@ ccp_finalize (void)
do_dbg_cnt ();
/* Perform substitutions based on the known constant values. */
something_changed = substitute_and_fold (const_val, ccp_fold_stmt);
something_changed = substitute_and_fold (const_val, ccp_fold_stmt, true);
free (const_val);
const_val = NULL;

2
gcc/tree-ssa-copy.c
View File

@ -854,7 +854,7 @@ fini_copy_prop (void)
duplicate_ssa_name_ptr_info (tmp[i].value, SSA_NAME_PTR_INFO (var));
}
substitute_and_fold (tmp, NULL);
substitute_and_fold (tmp, NULL, true);
free (cached_last_copy_of);
free (copy_of);

13
gcc/tree-ssa-propagate.c
View File

@ -964,10 +964,13 @@ replace_phi_args_in (gimple phi, prop_value_t *prop_value)
If FOLD_FN is non-NULL the function will be invoked on all statements
before propagating values for pass specific simplification.
DO_DCE is true if trivially dead stmts can be removed.
Return TRUE when something changed. */
bool
substitute_and_fold (prop_value_t *prop_value, ssa_prop_fold_stmt_fn fold_fn)
substitute_and_fold (prop_value_t *prop_value, ssa_prop_fold_stmt_fn fold_fn,
bool do_dce)
{
basic_block bb;
bool something_changed = false;
@ -1012,8 +1015,12 @@ substitute_and_fold (prop_value_t *prop_value, ssa_prop_fold_stmt_fn fold_fn)
continue;
/* No point propagating into a stmt whose result is not used,
but instead we might be able to remove a trivially dead stmt. */
if (gimple_get_lhs (stmt)
but instead we might be able to remove a trivially dead stmt.
Don't do this when called from VRP, since the SSA_NAME which
is going to be released could be still referenced in VRP
ranges. */
if (do_dce
&& gimple_get_lhs (stmt)
&& TREE_CODE (gimple_get_lhs (stmt)) == SSA_NAME
&& has_zero_uses (gimple_get_lhs (stmt))
&& !stmt_could_throw_p (stmt)

4
gcc/tree-ssa-propagate.h
View File

@ -1,6 +1,6 @@
/* Data structures and function declarations for the SSA value propagation
engine.
Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2004, 2005, 2007, 2008, 2010 Free Software Foundation, Inc.
Contributed by Diego Novillo <dnovillo@redhat.com>
This file is part of GCC.
@ -120,6 +120,6 @@ bool valid_gimple_call_p (tree);
void move_ssa_defining_stmt_for_defs (gimple, gimple);
bool update_call_from_tree (gimple_stmt_iterator *, tree);
bool stmt_makes_single_store (gimple);
bool substitute_and_fold (prop_value_t *, ssa_prop_fold_stmt_fn);
bool substitute_and_fold (prop_value_t *, ssa_prop_fold_stmt_fn, bool);
#endif /* _TREE_SSA_PROPAGATE_H */

2
gcc/tree-vrp.c
View File

@ -7343,7 +7343,7 @@ vrp_finalize (void)
single_val_range = NULL;
}
substitute_and_fold (single_val_range, vrp_fold_stmt);
substitute_and_fold (single_val_range, vrp_fold_stmt, false);
if (warn_array_bounds)
check_all_array_refs ();