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

re PR tree-optimization/70725 (Internal compiler error (ICE) on valid code)

Browse source 
2016-04-21  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/70725
	* tree-if-conv.c (if_convertible_phi_p): Adjust guard
	for phi_convertible_by_degenerating_args.
	(predicate_all_scalar_phis): Handle single-argument PHIs.

From-SVN: r235341
This commit is contained in:
Richard Biener 2016-04-21 14:09:33 +00:00 • committed by Richard Biener
parent c2bd3b6911
commit 49f428c9f4
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/ChangeLog
View file

@ -1,3 +1,10 @@
2016-04-21 Richard Biener <rguenther@suse.de>
PR tree-optimization/70725
* tree-if-conv.c (if_convertible_phi_p): Adjust guard
for phi_convertible_by_degenerating_args.
(predicate_all_scalar_phis): Handle single-argument PHIs.
2016-04-21 Richard Biener <rguenther@suse.de>
PR middle-end/70747

31
gcc/tree-if-conv.c
View file

@ -659,7 +659,7 @@ if_convertible_phi_p (struct loop *loop, basic_block bb, gphi *phi,
if (bb != loop->header)
{
if (gimple_phi_num_args (phi) != 2
if (gimple_phi_num_args (phi) > 2
&& !aggressive_if_conv
&& !phi_convertible_by_degenerating_args (phi))
{
@ -1911,20 +1911,31 @@ predicate_all_scalar_phis (struct loop *loop)
if (bb == loop->header)
continue;
if (EDGE_COUNT (bb->preds) == 1)
continue;
phi_gsi = gsi_start_phis (bb);
if (gsi_end_p (phi_gsi))
continue;
gsi = gsi_after_labels (bb);
while (!gsi_end_p (phi_gsi))
if (EDGE_COUNT (bb->preds) == 1)
{
phi = phi_gsi.phi ();
predicate_scalar_phi (phi, &gsi);
release_phi_node (phi);
gsi_next (&phi_gsi);
/* Propagate degenerate PHIs. */
for (phi_gsi = gsi_start_phis (bb); !gsi_end_p (phi_gsi);
gsi_next (&phi_gsi))
{
gphi *phi = phi_gsi.phi ();
replace_uses_by (gimple_phi_result (phi),
gimple_phi_arg_def (phi, 0));
}
}
else
{
gsi = gsi_after_labels (bb);
while (!gsi_end_p (phi_gsi))
{
phi = phi_gsi.phi ();
predicate_scalar_phi (phi, &gsi);
release_phi_node (phi);
gsi_next (&phi_gsi);
}
}
set_phi_nodes (bb, NULL);