re PR tree-optimization/40321 (internal compiler error: in compute_antic, at tree-ssa-pre.c:2501)
2009-07-22 Richard Guenther <rguenther@suse.de> PR tree-optimization/40321 * tree-ssa-pre.c (add_to_exp_gen): Also add names defined by PHI nodes to the maximal set. (make_values_for_phi): Add PHI arguments to the maximal set. (execute_pre): Dump PHI_GEN and the maximal set. * gcc.c-torture/compile/pr40321.c: New testcase. * g++.dg/torture/pr40321.C: Likewise. From-SVN: r149935
This commit is contained in:
parent
3293a63a60
commit
b145a595e1
|
@ -1,3 +1,11 @@
|
|||
2009-07-22 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
PR tree-optimization/40321
|
||||
* tree-ssa-pre.c (add_to_exp_gen): Also add names defined by
|
||||
PHI nodes to the maximal set.
|
||||
(make_values_for_phi): Add PHI arguments to the maximal set.
|
||||
(execute_pre): Dump PHI_GEN and the maximal set.
|
||||
|
||||
2009-07-22 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* BASE-VER: Set to 4.4.2.
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
2009-07-22 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
PR tree-optimization/40321
|
||||
* gcc.c-torture/compile/pr40321.c: New testcase.
|
||||
* g++.dg/torture/pr40321.C: Likewise.
|
||||
|
||||
2009-07-22 Release Manager
|
||||
|
||||
* GCC 4.4.1 released.
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
/* { dg-do compile } */
|
||||
|
||||
struct VectorD2
|
||||
{
|
||||
VectorD2() : x(0), y(0) { }
|
||||
VectorD2(int _x, int _y) : x(_x), y(_y) { }
|
||||
int x, y;
|
||||
int GetLength2() const { return x*x + y*y; };
|
||||
VectorD2 operator+(const VectorD2 vec) const {
|
||||
return VectorD2(x+vec.x,y+vec.y);
|
||||
}
|
||||
};
|
||||
struct Shape
|
||||
{
|
||||
enum Type { ST_RECT, ST_CIRCLE } type;
|
||||
VectorD2 pos;
|
||||
VectorD2 radius;
|
||||
bool CollisionWith(const Shape& s) const;
|
||||
};
|
||||
bool Shape::CollisionWith(const Shape& s) const
|
||||
{
|
||||
if(type == ST_CIRCLE && s.type == ST_RECT)
|
||||
return s.CollisionWith(*this);
|
||||
return (pos + s.pos).GetLength2() < (radius + s.radius).GetLength2();
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
struct X { int flag; int pos; };
|
||||
int foo(struct X *a, struct X *b)
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
if (a->flag)
|
||||
break;
|
||||
({ struct X *tmp = a; a = b; b = tmp; });
|
||||
}
|
||||
|
||||
return a->pos + b->pos;
|
||||
}
|
|
@ -3507,11 +3507,7 @@ insert (void)
|
|||
}
|
||||
|
||||
|
||||
/* Add OP to EXP_GEN (block), and possibly to the maximal set if it is
|
||||
not defined by a phi node.
|
||||
PHI nodes can't go in the maximal sets because they are not in
|
||||
TMP_GEN, so it is possible to get into non-monotonic situations
|
||||
during ANTIC calculation, because it will *add* bits. */
|
||||
/* Add OP to EXP_GEN (block), and possibly to the maximal set. */
|
||||
|
||||
static void
|
||||
add_to_exp_gen (basic_block block, tree op)
|
||||
|
@ -3523,9 +3519,7 @@ add_to_exp_gen (basic_block block, tree op)
|
|||
return;
|
||||
result = get_or_alloc_expr_for_name (op);
|
||||
bitmap_value_insert_into_set (EXP_GEN (block), result);
|
||||
if (TREE_CODE (op) != SSA_NAME
|
||||
|| gimple_code (SSA_NAME_DEF_STMT (op)) != GIMPLE_PHI)
|
||||
bitmap_value_insert_into_set (maximal_set, result);
|
||||
bitmap_value_insert_into_set (maximal_set, result);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3544,6 +3538,20 @@ make_values_for_phi (gimple phi, basic_block block)
|
|||
add_to_value (get_expr_value_id (e), e);
|
||||
bitmap_insert_into_set (PHI_GEN (block), e);
|
||||
bitmap_value_insert_into_set (AVAIL_OUT (block), e);
|
||||
if (!in_fre)
|
||||
{
|
||||
unsigned i;
|
||||
for (i = 0; i < gimple_phi_num_args (phi); ++i)
|
||||
{
|
||||
tree arg = gimple_phi_arg_def (phi, i);
|
||||
if (TREE_CODE (arg) == SSA_NAME)
|
||||
{
|
||||
e = get_or_alloc_expr_for_name (arg);
|
||||
add_to_value (get_expr_value_id (e), e);
|
||||
bitmap_value_insert_into_set (maximal_set, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -4254,11 +4262,12 @@ execute_pre (bool do_fre ATTRIBUTE_UNUSED)
|
|||
FOR_ALL_BB (bb)
|
||||
{
|
||||
print_bitmap_set (dump_file, EXP_GEN (bb), "exp_gen", bb->index);
|
||||
print_bitmap_set (dump_file, TMP_GEN (bb), "tmp_gen",
|
||||
bb->index);
|
||||
print_bitmap_set (dump_file, AVAIL_OUT (bb), "avail_out",
|
||||
bb->index);
|
||||
print_bitmap_set (dump_file, PHI_GEN (bb), "phi_gen", bb->index);
|
||||
print_bitmap_set (dump_file, TMP_GEN (bb), "tmp_gen", bb->index);
|
||||
print_bitmap_set (dump_file, AVAIL_OUT (bb), "avail_out", bb->index);
|
||||
}
|
||||
|
||||
print_bitmap_set (dump_file, maximal_set, "maximal", 0);
|
||||
}
|
||||
|
||||
/* Insert can get quite slow on an incredibly large number of basic
|
||||
|
|
Loading…
Reference in New Issue