diff options
| author | Richard Biener <rguenther@suse.de> | 2013-04-29 14:14:05 +0000 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2013-04-29 14:14:05 +0000 |
| commit | f2d2cc243742d00c9663fbfec1fa94d11b1b3f24 (patch) | |
| tree | cd418cb40125151bfe95d97da14858c5f7c7b0df /gcc/tree-cfg.c | |
| parent | 8dac3bf111b26e1016aadc192f01d4433681eade (diff) | |
2013-04-29 Richard Biener <rguenther@suse.de>
PR middle-end/57103
* tree-cfg.c (move_stmt_op): Fix condition under which to update
TREE_BLOCK.
(move_stmt_r): Remove redundant checking.
* gcc.dg/autopar/pr57103.c: New testcase.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@198419 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-cfg.c')
| -rw-r--r-- | gcc/tree-cfg.c | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 5466e8b43a1..28f05a589c6 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -6099,10 +6099,19 @@ move_stmt_op (tree *tp, int *walk_subtrees, void *data) if (EXPR_P (t)) { - if (TREE_BLOCK (t) == p->orig_block + tree block = TREE_BLOCK (t); + if (block == p->orig_block || (p->orig_block == NULL_TREE - && TREE_BLOCK (t) == NULL_TREE)) + && block != NULL_TREE)) TREE_SET_BLOCK (t, p->new_block); +#ifdef ENABLE_CHECKING + else if (block != NULL_TREE) + { + while (block && TREE_CODE (block) == BLOCK && block != p->orig_block) + block = BLOCK_SUPERCONTEXT (block); + gcc_assert (block == p->orig_block); + } +#endif } else if (DECL_P (t) || TREE_CODE (t) == SSA_NAME) { @@ -6187,18 +6196,10 @@ move_stmt_r (gimple_stmt_iterator *gsi_p, bool *handled_ops_p, gimple stmt = gsi_stmt (*gsi_p); tree block = gimple_block (stmt); - if (p->orig_block == NULL_TREE - || block == p->orig_block - || block == NULL_TREE) + if (block == p->orig_block + || (p->orig_block == NULL_TREE + && block != NULL_TREE)) gimple_set_block (stmt, p->new_block); -#ifdef ENABLE_CHECKING - else if (block != p->new_block) - { - while (block && block != p->orig_block) - block = BLOCK_SUPERCONTEXT (block); - gcc_assert (block); - } -#endif switch (gimple_code (stmt)) { @@ -6426,14 +6427,6 @@ move_block_to_fn (struct function *dest_cfun, basic_block bb, e->goto_locus = d->new_block ? COMBINE_LOCATION_DATA (line_table, e->goto_locus, d->new_block) : LOCATION_LOCUS (e->goto_locus); -#ifdef ENABLE_CHECKING - else if (block != d->new_block) - { - while (block && block != d->orig_block) - block = BLOCK_SUPERCONTEXT (block); - gcc_assert (block); - } -#endif } } |