diff options
Diffstat (limited to 'gcc/tree-vrp.c')
| -rw-r--r-- | gcc/tree-vrp.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 81645485f8b..152d389a9c7 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -3280,7 +3280,8 @@ vrp_var_may_overflow (tree var, gimple stmt) return true; l = loop_containing_stmt (stmt); - if (l == NULL) + if (l == NULL + || !loop_outer (l)) return true; chrec = instantiate_parameters (l, analyze_scalar_evolution (l, var)); @@ -5342,7 +5343,6 @@ vrp_visit_assignment_or_call (gimple stmt, tree *output_p) && TYPE_MAX_VALUE (TREE_TYPE (lhs))) || POINTER_TYPE_P (TREE_TYPE (lhs)))) { - struct loop *l; value_range_t new_vr = { VR_UNDEFINED, NULL_TREE, NULL_TREE, NULL }; if (code == GIMPLE_CALL) @@ -5350,12 +5350,6 @@ vrp_visit_assignment_or_call (gimple stmt, tree *output_p) else extract_range_from_assignment (&new_vr, stmt); - /* If STMT is inside a loop, we may be able to know something - else about the range of LHS by examining scalar evolution - information. */ - if (current_loops && (l = loop_containing_stmt (stmt))) - adjust_range_with_scev (&new_vr, l, stmt, lhs); - if (update_value_range (lhs, &new_vr)) { *output_p = lhs; @@ -6259,6 +6253,7 @@ vrp_visit_phi_node (gimple phi) value_range_t *lhs_vr = get_value_range (lhs); value_range_t vr_result = { VR_UNDEFINED, NULL_TREE, NULL_TREE, NULL }; int edges, old_edges; + struct loop *l; copy_value_range (&vr_result, lhs_vr); @@ -6322,6 +6317,13 @@ vrp_visit_phi_node (gimple phi) } } + /* If this is a loop PHI node SCEV may known more about its + value-range. */ + if (current_loops + && (l = loop_containing_stmt (phi)) + && l->header == gimple_bb (phi)) + adjust_range_with_scev (&vr_result, l, phi, lhs); + if (vr_result.type == VR_VARYING) goto varying; |