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

re PR tree-optimization/47737 (wrong code with -funswitch-loops -fno-tree-dominator-opts -fgraphite-identity) 

2011-02-18  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/47737
	* tree-ssa-loop-im.c (extract_true_false_args_from_phi): Fix
	edge dominance check.

From-SVN: r170272
This commit is contained in:
Richard Guenther 2011-02-18 13:22:17 +00:00 committed by Richard Biener
parent 357f98e552
commit 12d80acc48
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2011-02-18 Richard Guenther <rguenther@suse.de>
PR tree-optimization/47737
* tree-ssa-loop-im.c (extract_true_false_args_from_phi): Fix
edge dominance check.
2011-02-18 Jakub Jelinek <jakub@redhat.com> 2011-02-18 Jakub Jelinek <jakub@redhat.com>
PR debug/47780 PR debug/47780

33
gcc/tree-ssa-loop-im.c
View File

@ -676,31 +676,38 @@ extract_true_false_args_from_phi (basic_block dom, gimple phi,
by the true edge of the predicate block and the other edge by the true edge of the predicate block and the other edge
dominated by the false edge. This ensures that the PHI argument dominated by the false edge. This ensures that the PHI argument
we are going to take is completely determined by the path we we are going to take is completely determined by the path we
take from the predicate block. */ take from the predicate block.
We can only use BB dominance checks below if the destination of
the true/false edges are dominated by their edge, thus only
have a single predecessor. */
extract_true_false_edges_from_block (dom, &true_edge, &false_edge); extract_true_false_edges_from_block (dom, &true_edge, &false_edge);
tem = EDGE_PRED (bb, 0); tem = EDGE_PRED (bb, 0);
if (tem == true_edge if (tem == true_edge
|| tem->src == true_edge->dest || (single_pred_p (true_edge->dest)
|| dominated_by_p (CDI_DOMINATORS, && (tem->src == true_edge->dest
tem->src, true_edge->dest)) || dominated_by_p (CDI_DOMINATORS,
tem->src, true_edge->dest))))
arg0 = PHI_ARG_DEF (phi, tem->dest_idx); arg0 = PHI_ARG_DEF (phi, tem->dest_idx);
else if (tem == false_edge else if (tem == false_edge
|| tem->src == false_edge->dest || (single_pred_p (false_edge->dest)
|| dominated_by_p (CDI_DOMINATORS, && (tem->src == false_edge->dest
tem->src, false_edge->dest)) || dominated_by_p (CDI_DOMINATORS,
tem->src, false_edge->dest))))
arg1 = PHI_ARG_DEF (phi, tem->dest_idx); arg1 = PHI_ARG_DEF (phi, tem->dest_idx);
else else
return false; return false;
tem = EDGE_PRED (bb, 1); tem = EDGE_PRED (bb, 1);
if (tem == true_edge if (tem == true_edge
|| tem->src == true_edge->dest || (single_pred_p (true_edge->dest)
|| dominated_by_p (CDI_DOMINATORS, && (tem->src == true_edge->dest
tem->src, true_edge->dest)) || dominated_by_p (CDI_DOMINATORS,
tem->src, true_edge->dest))))
arg0 = PHI_ARG_DEF (phi, tem->dest_idx); arg0 = PHI_ARG_DEF (phi, tem->dest_idx);
else if (tem == false_edge else if (tem == false_edge
|| tem->src == false_edge->dest || (single_pred_p (false_edge->dest)
|| dominated_by_p (CDI_DOMINATORS, && (tem->src == false_edge->dest
tem->src, false_edge->dest)) || dominated_by_p (CDI_DOMINATORS,
tem->src, false_edge->dest))))
arg1 = PHI_ARG_DEF (phi, tem->dest_idx); arg1 = PHI_ARG_DEF (phi, tem->dest_idx);
else else
return false; return false;