diff options
Diffstat (limited to 'gcc/tree-scalar-evolution.c')
| -rw-r--r-- | gcc/tree-scalar-evolution.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c index 955240b6895..b2a266bbf46 100644 --- a/gcc/tree-scalar-evolution.c +++ b/gcc/tree-scalar-evolution.c @@ -1534,7 +1534,7 @@ interpret_loop_phi (struct loop *loop, tree loop_phi_node) (phi_loop, PHI_RESULT (loop_phi_node)); /* Dive one level deeper. */ - subloop = superloop_at_depth (phi_loop, loop->depth + 1); + subloop = superloop_at_depth (phi_loop, loop_depth (loop) + 1); /* Interpret the subloop. */ res = compute_overall_effect_of_inner_loop (subloop, evolution_fn); @@ -1680,7 +1680,7 @@ compute_scalar_evolution_in_loop (struct loop *wrto_loop, if (def_loop == wrto_loop) return ev; - def_loop = superloop_at_depth (def_loop, wrto_loop->depth + 1); + def_loop = superloop_at_depth (def_loop, loop_depth (wrto_loop) + 1); res = compute_overall_effect_of_inner_loop (def_loop, ev); return analyze_scalar_evolution_1 (wrto_loop, res, chrec_not_analyzed_yet); @@ -2023,7 +2023,7 @@ analyze_scalar_evolution_in_loop (struct loop *wrto_loop, struct loop *use_loop, || !val) return chrec_dont_know; - use_loop = use_loop->outer; + use_loop = loop_outer (use_loop); } } @@ -2169,8 +2169,8 @@ instantiate_parameters_1 (struct loop *loop, tree chrec, int flags, htab_t cache /* Don't instantiate loop-closed-ssa phi nodes. */ if (TREE_CODE (res) == SSA_NAME && (loop_containing_stmt (SSA_NAME_DEF_STMT (res)) == NULL - || (loop_containing_stmt (SSA_NAME_DEF_STMT (res))->depth - > def_loop->depth))) + || (loop_depth (loop_containing_stmt (SSA_NAME_DEF_STMT (res))) + > loop_depth (def_loop)))) { if (res == chrec) res = loop_closed_phi_def (chrec); @@ -2966,7 +2966,8 @@ scev_const_prop (void) tree_block_label (exit->dest); bsi = bsi_after_labels (exit->dest); - ex_loop = superloop_at_depth (loop, exit->dest->loop_father->depth + 1); + ex_loop = superloop_at_depth (loop, + loop_depth (exit->dest->loop_father) + 1); for (phi = phi_nodes (exit->dest); phi; phi = next_phi) { |