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

re PR debug/44901 (-fcompare-debug failure for tree-predcom.c) 

PR debug/44901
	* vec.h (VEC_block_remove): Fix comment.
	* tree-ssa-live.c (remove_unused_locals): Don't use
	VEC_unordered_remove on local_decls, instead replace a single
	vector element in each iteration if at least one element had
	to be removed and VEC_truncate at the end.
	* omp-low.c (expand_omp_taskreg): Likewise.

From-SVN: r162126
This commit is contained in:
Jakub Jelinek 2010-07-13 08:59:56 +02:00 committed by Jakub Jelinek
parent 88ce80316f
commit 2fed2012d5
4 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2010-07-13 Jakub Jelinek <jakub@redhat.com>
PR debug/44901
* vec.h (VEC_block_remove): Fix comment.
* tree-ssa-live.c (remove_unused_locals): Don't use
VEC_unordered_remove on local_decls, instead replace a single
vector element in each iteration if at least one element had
to be removed and VEC_truncate at the end.
* omp-low.c (expand_omp_taskreg): Likewise.
2010-07-13 Manuel López-Ibáñez <manu@gcc.gnu.org>
* c-decl.c (finish_function): Fix typo in comment.

19
gcc/omp-low.c
View File

@ -3378,7 +3378,7 @@ expand_omp_taskreg (struct omp_region *region)
}
else
{
unsigned ix;
unsigned srcidx, dstidx, num;
/* If the parallel region needs data sent from the parent
function, then the very first statement (except possible
@ -3515,11 +3515,18 @@ expand_omp_taskreg (struct omp_region *region)
single_succ_edge (new_bb)->flags = EDGE_FALLTHRU;
/* Remove non-local VAR_DECLs from child_cfun->local_decls list. */
for (ix = 0; VEC_iterate (tree, child_cfun->local_decls, ix, t); )
if (DECL_CONTEXT (t) != cfun->decl)
ix++;
else
VEC_unordered_remove (tree, child_cfun->local_decls, ix);
num = VEC_length (tree, child_cfun->local_decls);
for (srcidx = 0, dstidx = 0; srcidx < num; srcidx++)
{
t = VEC_index (tree, child_cfun->local_decls, srcidx);
if (DECL_CONTEXT (t) == cfun->decl)
continue;
if (srcidx != dstidx)
VEC_replace (tree, child_cfun->local_decls, dstidx, t);
dstidx++;
}
if (dstidx != num)
VEC_truncate (tree, child_cfun->local_decls, dstidx);
/* Inform the callgraph about the new function. */
DECL_STRUCT_FUNCTION (child_fn)->curr_properties

39
gcc/tree-ssa-live.c
View File

@ -689,7 +689,7 @@ remove_unused_locals (void)
referenced_var_iterator rvi;
var_ann_t ann;
bitmap global_unused_vars = NULL;
unsigned ix;
unsigned srcidx, dstidx, num;
/* Removing declarations from lexical blocks when not optimizing is
not only a waste of time, it actually causes differences in stack
@ -756,8 +756,10 @@ remove_unused_locals (void)
cfun->has_local_explicit_reg_vars = false;
/* Remove unmarked local vars from local_decls. */
for (ix = 0; VEC_iterate (tree, cfun->local_decls, ix, var); )
num = VEC_length (tree, cfun->local_decls);
for (srcidx = 0, dstidx = 0; srcidx < num; srcidx++)
{
var = VEC_index (tree, cfun->local_decls, srcidx);
if (TREE_CODE (var) != FUNCTION_DECL
&& (!(ann = var_ann (var))
|| !ann->used))
@ -769,18 +771,19 @@ remove_unused_locals (void)
bitmap_set_bit (global_unused_vars, DECL_UID (var));
}
else
{
VEC_unordered_remove (tree, cfun->local_decls, ix);
continue;
}
continue;
}
else if (TREE_CODE (var) == VAR_DECL
&& DECL_HARD_REGISTER (var)
&& !is_global_var (var))
cfun->has_local_explicit_reg_vars = true;
ix++;
if (srcidx != dstidx)
VEC_replace (tree, cfun->local_decls, dstidx, var);
dstidx++;
}
if (dstidx != num)
VEC_truncate (tree, cfun->local_decls, dstidx);
/* Remove unmarked global vars from local_decls. */
if (global_unused_vars != NULL)
@ -794,13 +797,21 @@ remove_unused_locals (void)
&& ann->used)
mark_all_vars_used (&DECL_INITIAL (var), global_unused_vars);
for (ix = 0; VEC_iterate (tree, cfun->local_decls, ix, var); )
if (TREE_CODE (var) == VAR_DECL
&& is_global_var (var)
&& bitmap_bit_p (global_unused_vars, DECL_UID (var)))
VEC_unordered_remove (tree, cfun->local_decls, ix);
else
ix++;
num = VEC_length (tree, cfun->local_decls);
for (srcidx = 0, dstidx = 0; srcidx < num; srcidx++)
{
var = VEC_index (tree, cfun->local_decls, srcidx);
if (TREE_CODE (var) == VAR_DECL
&& is_global_var (var)
&& bitmap_bit_p (global_unused_vars, DECL_UID (var)))
continue;
if (srcidx != dstidx)
VEC_replace (tree, cfun->local_decls, dstidx, var);
dstidx++;
}
if (dstidx != num)
VEC_truncate (tree, cfun->local_decls, dstidx);
BITMAP_FREE (global_unused_vars);
}

2
gcc/vec.h
View File

@ -424,7 +424,7 @@ along with GCC; see the file COPYING3. If not see
void VEC_T_block_remove (VEC(T) *v, unsigned ix, unsigned len);
Remove LEN elements starting at the IXth. Ordering is retained.
This is an O(1) operation. */
This is an O(N) operation due to memmove. */
#define VEC_block_remove(T,V,I,L) \
(VEC_OP(T,base,block_remove)(VEC_BASE(V),I,L VEC_CHECK_INFO))