static bool
maybe_skip_until (gimple phi, tree target, ao_ref *ref,
- tree vuse, unsigned int *cnt, bitmap *visited)
+ tree vuse, unsigned int *cnt, bitmap *visited,
+ bool abort_on_visited)
{
basic_block bb = gimple_bb (phi);
{
/* An already visited PHI node ends the walk successfully. */
if (bitmap_bit_p (*visited, SSA_NAME_VERSION (PHI_RESULT (def_stmt))))
- return true;
- vuse = get_continuation_for_phi (def_stmt, ref, cnt, visited);
+ return !abort_on_visited;
+ vuse = get_continuation_for_phi (def_stmt, ref, cnt,
+ visited, abort_on_visited);
if (!vuse)
return false;
continue;
if (gimple_bb (def_stmt) != bb)
{
if (!bitmap_set_bit (*visited, SSA_NAME_VERSION (vuse)))
- return true;
+ return !abort_on_visited;
bb = gimple_bb (def_stmt);
}
vuse = gimple_vuse (def_stmt);
static tree
get_continuation_for_phi_1 (gimple phi, tree arg0, tree arg1,
- ao_ref *ref, unsigned int *cnt, bitmap *visited)
+ ao_ref *ref, unsigned int *cnt,
+ bitmap *visited, bool abort_on_visited)
{
gimple def0 = SSA_NAME_DEF_STMT (arg0);
gimple def1 = SSA_NAME_DEF_STMT (arg1);
&& dominated_by_p (CDI_DOMINATORS,
gimple_bb (def1), gimple_bb (def0))))
{
- if (maybe_skip_until (phi, arg0, ref, arg1, cnt, visited))
+ if (maybe_skip_until (phi, arg0, ref, arg1, cnt,
+ visited, abort_on_visited))
return arg0;
}
else if (gimple_nop_p (def1)
|| dominated_by_p (CDI_DOMINATORS,
gimple_bb (def0), gimple_bb (def1)))
{
- if (maybe_skip_until (phi, arg1, ref, arg0, cnt, visited))
+ if (maybe_skip_until (phi, arg1, ref, arg0, cnt,
+ visited, abort_on_visited))
return arg1;
}
/* Special case of a diamond:
tree
get_continuation_for_phi (gimple phi, ao_ref *ref,
- unsigned int *cnt, bitmap *visited)
+ unsigned int *cnt, bitmap *visited,
+ bool abort_on_visited)
{
unsigned nargs = gimple_phi_num_args (phi);
{
arg1 = PHI_ARG_DEF (phi, i);
arg0 = get_continuation_for_phi_1 (phi, arg0, arg1, ref,
- cnt, visited);
+ cnt, visited, abort_on_visited);
if (!arg0)
return NULL_TREE;
}
bitmap visited = NULL;
void *res;
unsigned int cnt = 0;
+ bool translated = false;
timevar_push (TV_ALIAS_STMT_WALK);
if (gimple_nop_p (def_stmt))
break;
else if (gimple_code (def_stmt) == GIMPLE_PHI)
- vuse = get_continuation_for_phi (def_stmt, ref, &cnt, &visited);
+ vuse = get_continuation_for_phi (def_stmt, ref, &cnt,
+ &visited, translated);
else
{
cnt++;
else if (res != NULL)
break;
/* Translation succeeded, continue walking. */
+ translated = true;
}
vuse = gimple_vuse (def_stmt);
}