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

cfgexpand.c (pass_expand::execute): Deal specially with instructions to be inserted on single successor edge of the...

Browse source 
* cfgexpand.c (pass_expand::execute): Deal specially with instructions
	to be inserted on single successor edge of the entry block.  Then call
	commit_edge_insertions instead of inserting the instructions manually.
	* cfgrtl.c (commit_edge_insertions): Do not verify flow info during
	RTL expansion.

From-SVN: r272929
This commit is contained in:
Eric Botcazou 2019-07-02 09:44:47 +00:00 • committed by Eric Botcazou
parent 2e2c9da012
commit 82cea5e8bf
3 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/ChangeLog
View file

@ -1,3 +1,11 @@
2019-07-02 Eric Botcazou <ebotcazou@adacore.com>
* cfgexpand.c (pass_expand::execute): Deal specially with instructions
to be inserted on single successor edge of the entry block. Then call
commit_edge_insertions instead of inserting the instructions manually.
* cfgrtl.c (commit_edge_insertions): Do not verify flow info during
RTL expansion.
2019-07-02 Richard Biener <rguenther@suse.de>
* tree-core.h (enum tree_index): Add TI_CHREC_DONT_KNOW and

40
gcc/cfgexpand.c
View file

@ -6576,37 +6576,27 @@ pass_expand::execute (function *fun)
split edges which edge insertions might do. */
rebuild_jump_labels (get_insns ());
FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR_FOR_FN (fun),
EXIT_BLOCK_PTR_FOR_FN (fun), next_bb)
/* If we have a single successor to the entry block, put the pending insns
after parm birth, but before NOTE_INSNS_FUNCTION_BEG. */
if (single_succ_p (ENTRY_BLOCK_PTR_FOR_FN (fun)))
{
edge e;
edge_iterator ei;
for (ei = ei_start (bb->succs); (e = ei_safe_edge (ei)); )
edge e = single_succ_edge (ENTRY_BLOCK_PTR_FOR_FN (fun));
if (e->insns.r)
{
if (e->insns.r)
{
rebuild_jump_labels_chain (e->insns.r);
/* Put insns after parm birth, but before
NOTE_INSNS_FUNCTION_BEG. */
if (e->src == ENTRY_BLOCK_PTR_FOR_FN (fun)
&& single_succ_p (ENTRY_BLOCK_PTR_FOR_FN (fun)))
{
rtx_insn *insns = e->insns.r;
e->insns.r = NULL;
if (NOTE_P (parm_birth_insn)
&& NOTE_KIND (parm_birth_insn) == NOTE_INSN_FUNCTION_BEG)
emit_insn_before_noloc (insns, parm_birth_insn, e->dest);
else
emit_insn_after_noloc (insns, parm_birth_insn, e->dest);
}
else
commit_one_edge_insertion (e);
}
rtx_insn *insns = e->insns.r;
e->insns.r = NULL;
rebuild_jump_labels_chain (insns);
if (NOTE_P (parm_birth_insn)
&& NOTE_KIND (parm_birth_insn) == NOTE_INSN_FUNCTION_BEG)
emit_insn_before_noloc (insns, parm_birth_insn, e->dest);
else
ei_next (&ei);
emit_insn_after_noloc (insns, parm_birth_insn, e->dest);
}
}
/* Otherwise, as well as for other edges, take the usual way. */
commit_edge_insertions ();
/* We're done expanding trees to RTL. */
currently_expanding_to_rtl = 0;

3
gcc/cfgrtl.c
View file

@ -2105,7 +2105,8 @@ commit_edge_insertions (void)
which will be done by fixup_partitions. */
fixup_partitions ();
checking_verify_flow_info ();
if (!currently_expanding_to_rtl)
checking_verify_flow_info ();
FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR_FOR_FN (cfun),
EXIT_BLOCK_PTR_FOR_FN (cfun), next_bb)