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

re PR gcov-profile/49299 (ICE in gimple_ic on profile feedback build) 

PR gcov-profile/49299
	* value-prof.c (gimple_ic): Don't assume icall has
	a fallthru edge.

	* gcc.dg/tree-prof/pr49299-1.c: New test.
	* gcc.dg/tree-prof/pr49299-2.c: New test.

From-SVN: r174738
This commit is contained in:
Jakub Jelinek 2011-06-07 11:48:53 +02:00 committed by Jakub Jelinek
parent 34b6bcade4
commit 308dc890dd
5 changed files with 102 additions and 12 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-06-07 Jakub Jelinek <jakub@redhat.com>
PR gcov-profile/49299
* value-prof.c (gimple_ic): Don't assume icall has
a fallthru edge.
2011-06-07 Ira Rosen <ira.rosen@linaro.org>
* tree-vectorizer.h (vect_recog_func_ptr): Make last argument to be

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-07 Jakub Jelinek <jakub@redhat.com>
PR gcov-profile/49299
* gcc.dg/tree-prof/pr49299-1.c: New test.
* gcc.dg/tree-prof/pr49299-2.c: New test.
2011-06-07 Ira Rosen <ira.rosen@linaro.org>
* lib/target-supports.exp

34
gcc/testsuite/gcc.dg/tree-prof/pr49299-1.c Normal file
View File

@ -0,0 +1,34 @@
/* { dg-options "-O2" } */
__attribute__((noreturn)) void (*fn) (void);
volatile int v;
__attribute__((noreturn)) void
fn0 (void)
{
__builtin_exit (0);
}
__attribute__((noreturn)) void
fn1 (void)
{
__builtin_exit (1);
}
__attribute__((noinline, noclone)) void
setfn (__attribute__((noreturn)) void (*x) (void))
{
fn = x;
}
int
main ()
{
int i;
if (v < 1)
setfn (fn0);
else
setfn (fn1);
fn ();
}

34
gcc/testsuite/gcc.dg/tree-prof/pr49299-2.c Normal file
View File

@ -0,0 +1,34 @@
/* { dg-options "-O2" } */
void (*fn) (void);
volatile int v;
__attribute__((noreturn)) void
fn0 (void)
{
__builtin_exit (0);
}
void
fn1 (void)
{
}
__attribute__((noinline, noclone)) void
setfn (void (*x) (void))
{
fn = x;
}
int
main ()
{
int i;
if (v < 1)
setfn (fn0);
else
setfn (fn1);
fn ();
return 0;
}

34
gcc/value-prof.c
View File

@ -1145,9 +1145,9 @@ gimple_ic (gimple icall_stmt, struct cgraph_node *direct_call,
{
gimple dcall_stmt, load_stmt, cond_stmt;
tree tmp0, tmp1, tmpv, tmp;
basic_block cond_bb, dcall_bb, icall_bb, join_bb;
basic_block cond_bb, dcall_bb, icall_bb, join_bb = NULL;
tree optype = build_pointer_type (void_type_node);
edge e_cd, e_ci, e_di, e_dj, e_ij;
edge e_cd, e_ci, e_di, e_dj = NULL, e_ij;
gimple_stmt_iterator gsi;
int lp_nr;
@ -1194,12 +1194,19 @@ gimple_ic (gimple icall_stmt, struct cgraph_node *direct_call,
else
{
e_ij = find_fallthru_edge (icall_bb->succs);
e_ij->probability = REG_BR_PROB_BASE;
e_ij->count = all - count;
e_ij = single_pred_edge (split_edge (e_ij));
/* The indirect call might be noreturn. */
if (e_ij != NULL)
{
e_ij->probability = REG_BR_PROB_BASE;
e_ij->count = all - count;
e_ij = single_pred_edge (split_edge (e_ij));
}
}
if (e_ij != NULL)
{
join_bb = e_ij->dest;
join_bb->count = all;
}
join_bb = e_ij->dest;
join_bb->count = all;
e_cd->flags = (e_cd->flags & ~EDGE_FALLTHRU) | EDGE_TRUE_VALUE;
e_cd->probability = prob;
@ -1211,12 +1218,15 @@ gimple_ic (gimple icall_stmt, struct cgraph_node *direct_call,
remove_edge (e_di);
e_dj = make_edge (dcall_bb, join_bb, EDGE_FALLTHRU);
e_dj->probability = REG_BR_PROB_BASE;
e_dj->count = count;
if (e_ij != NULL)
{
e_dj = make_edge (dcall_bb, join_bb, EDGE_FALLTHRU);
e_dj->probability = REG_BR_PROB_BASE;
e_dj->count = count;
e_ij->probability = REG_BR_PROB_BASE;
e_ij->count = all - count;
e_ij->probability = REG_BR_PROB_BASE;
e_ij->count = all - count;
}
/* Insert PHI node for the call result if necessary. */
if (gimple_call_lhs (icall_stmt)