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

re PR tree-optimization/71643 (internal compiler error: in redirect_eh_edge_1, at tree-eh.c:2318 after r237427) 

PR tree-optimization/71643
	* tree-ssa-tail-merge.c (find_clusters_1): Ignore basic blocks with
	EH preds.

	* tree-ssa-tail-merge.c (deps_ok_for_redirect_from_bb_to_bb): Don't
	leak a bitmap if dep_bb is NULL.

	* g++.dg/opt/pr71643.C: New test.

From-SVN: r237783
This commit is contained in:
Jakub Jelinek 2016-06-25 19:23:02 +02:00 committed by Jakub Jelinek
parent 2a65e70bcf
commit f8a06e24da
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,5 +1,12 @@
2016-06-25 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/71643
* tree-ssa-tail-merge.c (find_clusters_1): Ignore basic blocks with
EH preds.
* tree-ssa-tail-merge.c (deps_ok_for_redirect_from_bb_to_bb): Don't
leak a bitmap if dep_bb is NULL.
PR tree-optimization/71631
* tree-ssa-reassoc.c (reassociate_bb): Pass true as last argument
to rewrite_expr_tree even if negate_result, move new_lhs var

3
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2016-06-25 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/71643
* g++.dg/opt/pr71643.C: New test.
PR tree-optimization/71631
* gcc.c-torture/execute/pr71631.c: New test.

20
gcc/testsuite/g++.dg/opt/pr71643.C Normal file
View File

@ -0,0 +1,20 @@
// PR tree-optimization/71643
// { dg-do compile }
// { dg-options "-O2" }
struct A
{
void *operator new (__SIZE_TYPE__, double);
void operator delete (void *, double) { __builtin_unreachable (); }
A (int x);
static A *bar (int x) { return new (3.0) A (x); }
};
void baz (A *, A *);
void
foo (int a, int b)
{
A *p = A::bar (a);
A *q = A::bar (b);
baz (p, q);
}

6
gcc/tree-ssa-tail-merge.c
View File

@ -1398,11 +1398,11 @@ deps_ok_for_redirect_from_bb_to_bb (basic_block from, basic_block to)
basic_block cd, dep_bb = BB_DEP_BB (to);
edge_iterator ei;
edge e;
bitmap from_preds = BITMAP_ALLOC (NULL);
if (dep_bb == NULL)
return true;
bitmap from_preds = BITMAP_ALLOC (NULL);
FOR_EACH_EDGE (e, ei, from->preds)
bitmap_set_bit (from_preds, e->src->index);
cd = nearest_common_dominator_for_set (CDI_DOMINATORS, from_preds);
@ -1446,7 +1446,7 @@ find_clusters_1 (same_succ *same_succ)
/* TODO: handle blocks with phi-nodes. We'll have to find corresponding
phi-nodes in bb1 and bb2, with the same alternatives for the same
preds. */
if (bb_has_non_vop_phi (bb1))
if (bb_has_non_vop_phi (bb1) || bb_has_eh_pred (bb1))
continue;
nr_comparisons = 0;
@ -1454,7 +1454,7 @@ find_clusters_1 (same_succ *same_succ)
{
bb2 = BASIC_BLOCK_FOR_FN (cfun, j);
if (bb_has_non_vop_phi (bb2))
if (bb_has_non_vop_phi (bb2) || bb_has_eh_pred (bb2))
continue;
if (BB_CLUSTER (bb1) != NULL && BB_CLUSTER (bb1) == BB_CLUSTER (bb2))