procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cfg.c (redirect_edge_succ_nodup): Duplicate the varm map before removing the edge.

Browse source 
* cfg.c (redirect_edge_succ_nodup): Duplicate the varm map
	before removing the edge.

	* cfgrtl.c (cfg_layout_redirect_edge_and_branch): Do not use E after
	it may have been freed by redirect_branch_edge or
	redirect_edge_succ_nodup.

From-SVN: r171356
This commit is contained in:
Jeff Law 2011-03-23 11:35:59 -06:00 • committed by Jeff Law
parent 58da96fef9
commit 0c617be487
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gcc/ChangeLog
View file

@ -1,3 +1,12 @@
2011-03-23 Jeff Law <law@redhat.com>
* cfg.c (redirect_edge_succ_nodup): Duplicate the varm map
before removing the edge.
* cfgrtl.c (cfg_layout_redirect_edge_and_branch): Do not use E after
it may have been freed by redirect_branch_edge or
redirect_edge_succ_nodup.
2011-03-23 Richard Guenther <rguenther@suse.de>
* tree-stdarg.c (va_list_counter_bump): Handle bumps via

2
gcc/cfg.c
View file

@ -402,8 +402,8 @@ redirect_edge_succ_nodup (edge e, basic_block new_succ)
if (s->probability > REG_BR_PROB_BASE)
s->probability = REG_BR_PROB_BASE;
s->count += e->count;
remove_edge (e);
redirect_edge_var_map_dup (s, e);
remove_edge (e);
e = s;
}
else

8
gcc/cfgrtl.c
View file

@ -2537,9 +2537,9 @@ cfg_layout_redirect_edge_and_branch (edge e, basic_block dest)
e->flags &= ~EDGE_FALLTHRU;
redirected = redirect_branch_edge (e, dest);
gcc_assert (redirected);
e->flags |= EDGE_FALLTHRU;
df_set_bb_dirty (e->src);
return e;
redirected->flags |= EDGE_FALLTHRU;
df_set_bb_dirty (redirected->src);
return redirected;
}
/* In case we are redirecting fallthru edge to the branch edge
of conditional jump, remove it. */
@ -2553,10 +2553,10 @@ cfg_layout_redirect_edge_and_branch (edge e, basic_block dest)
&& onlyjump_p (BB_END (src)))
delete_insn (BB_END (src));
}
ret = redirect_edge_succ_nodup (e, dest);
if (dump_file)
fprintf (dump_file, "Fallthru edge %i->%i redirected to %i\n",
e->src->index, e->dest->index, dest->index);
ret = redirect_edge_succ_nodup (e, dest);
}
else
ret = redirect_branch_edge (e, dest);