+2016-10-07 Richard Biener <rguenther@suse.de>
+
+ * tree-ssa-propagate.c (replace_phi_args_in): Remove no longer
+ required hack.
+ (substitute_and_fold_dom_walker::before_dom_children):
+ Substitute and fold before pass specific folding to avoid
+ feeding that with SSA names that will be later released.
+ * tree-ssa-ccp.c (get_value_for_expr): Guard for new SSA names
+ introduced by folding and visited by evaluate_stmt called during
+ ccp_fold_stmt.
+ (likely_value): Likewise.
+ (evaluate_stmt): Likewise.
+ * tree-vrp.c (simplify_truth_ops_using_ranges): Fold modified stmt.
+ (simplify_div_or_mod_using_ranges): Likewise.
+ (simplify_min_or_max_using_ranges): Likewise.
+ (simplify_abs_using_ranges): Likewise.
+ (simplify_conversion_using_ranges): Likewise.
+ (simplify_float_conversion_using_ranges): Likewise.
+ (simplify_stmt_using_ranges): Likewise.
+
2016-10-07 Marek Polacek <polacek@redhat.com>
* gimplify.c (should_warn_for_implicit_fallthrough): Check for
+2016-10-07 Richard Biener <rguenther@suse.de>
+
+ * gcc.dg/tree-ssa/vrp01.c: Adjust.
+ * gcc.dg/tree-ssa/vrp34.c: Likewise.
+
2016-10-07 Marek Polacek <polacek@redhat.com>
* c-c++-common/Wimplicit-fallthrough-22.c: New test.
return i;
}
-/* { dg-final { scan-tree-dump-times "Folding predicate p_.*to 1" 1 "vrp1" } } */
+/* { dg-final { scan-tree-dump-times "if \\\(" 2 "vrp1" } } */
}
}
-/* { dg-final { scan-tree-dump "Folding predicate a_. > 2 to 1" "vrp1" } } */
-/* { dg-final { scan-tree-dump "Folding predicate a_. <= 5 to 1" "vrp1" } } */
+/* Both ifs should be optimized. */
+/* { dg-final { scan-tree-dump-times "if \\\(" 0 "vrp1" } } */
if (TREE_CODE (expr) == SSA_NAME)
{
- val = *get_value (expr);
+ ccp_prop_value_t *val_ = get_value (expr);
+ if (val_)
+ val = *val_;
+ else
+ {
+ val.lattice_val = VARYING;
+ val.value = NULL_TREE;
+ val.mask = -1;
+ }
if (for_bits_p
&& val.lattice_val == CONSTANT
&& TREE_CODE (val.value) == ADDR_EXPR)
{
ccp_prop_value_t *val = get_value (use);
- if (val->lattice_val == UNDEFINED)
+ if (val && val->lattice_val == UNDEFINED)
has_undefined_operand = true;
else
all_undefined_operands = false;
- if (val->lattice_val == CONSTANT)
+ if (val && val->lattice_val == CONSTANT)
has_constant_operand = true;
if (SSA_NAME_IS_DEFAULT_DEF (use)
simplified = ccp_fold (stmt);
if (simplified && TREE_CODE (simplified) == SSA_NAME)
{
- val = *get_value (simplified);
- if (val.lattice_val != VARYING)
+ ccp_prop_value_t *val = get_value (simplified);
+ if (val && val->lattice_val != VARYING)
{
fold_undefer_overflow_warnings (true, stmt, 0);
- return val;
+ return *val;
}
}
is_constant = simplified && is_gimple_min_invariant (simplified);
print_gimple_stmt (dump_file, phi, 0, TDF_SLIM);
}
- basic_block bb = gimple_bb (phi);
for (i = 0; i < gimple_phi_num_args (phi); i++)
{
tree arg = gimple_phi_arg_def (phi, i);
{
edge e = gimple_phi_arg_edge (phi, i);
- /* Avoid propagating constants into loop latch edge
- PHI arguments as this makes coalescing the copy
- across this edge impossible. If the argument is
- defined by an assert - otherwise the stmt will
- get removed without replacing its uses. */
- if (TREE_CODE (val) != SSA_NAME
- && bb->loop_father->header == bb
- && dominated_by_p (CDI_DOMINATORS, e->src, bb)
- && is_gimple_assign (SSA_NAME_DEF_STMT (arg))
- && (gimple_assign_rhs_code (SSA_NAME_DEF_STMT (arg))
- == ASSERT_EXPR))
- continue;
-
if (TREE_CODE (val) != SSA_NAME)
prop_stats.num_const_prop++;
else
bool was_noreturn = (is_gimple_call (stmt)
&& gimple_call_noreturn_p (stmt));
- /* Some statements may be simplified using propagator
- specific information. Do this before propagating
- into the stmt to not disturb pass specific information. */
- if (fold_fn
- && (*fold_fn)(&i))
- {
- did_replace = true;
- prop_stats.num_stmts_folded++;
- stmt = gsi_stmt (i);
- update_stmt (stmt);
- }
-
/* Replace real uses in the statement. */
did_replace |= replace_uses_in (stmt, get_value_fn);
{
fold_stmt (&i, follow_single_use_edges);
stmt = gsi_stmt (i);
+ gimple_set_modified (stmt, true);
+ }
+
+ /* Some statements may be simplified using propagator
+ specific information. Do this before propagating
+ into the stmt to not disturb pass specific information. */
+ if (fold_fn)
+ {
+ update_stmt_if_modified (stmt);
+ if ((*fold_fn)(&i))
+ {
+ did_replace = true;
+ prop_stats.num_stmts_folded++;
+ stmt = gsi_stmt (i);
+ gimple_set_modified (stmt, true);
+ }
}
/* If this is a control statement the propagator left edges
gimple_cond_make_true (as_a <gcond *> (stmt));
else
gimple_cond_make_false (as_a <gcond *> (stmt));
+ gimple_set_modified (stmt, true);
did_replace = true;
}
}
}
/* Determine what needs to be done to update the SSA form. */
- update_stmt (stmt);
+ update_stmt_if_modified (stmt);
if (!is_gimple_debug (stmt))
something_changed = true;
}
else
gimple_assign_set_rhs_with_ops (gsi, BIT_XOR_EXPR, op0, op1);
update_stmt (gsi_stmt (*gsi));
+ fold_stmt (gsi, follow_single_use_edges);
return true;
}
}
update_stmt (stmt);
+ fold_stmt (gsi, follow_single_use_edges);
return true;
}
gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
gimple_assign_set_rhs_from_tree (&gsi, res);
update_stmt (stmt);
+ fold_stmt (&gsi, follow_single_use_edges);
return true;
}
else
gimple_assign_set_rhs_code (stmt, NEGATE_EXPR);
update_stmt (stmt);
+ gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
+ fold_stmt (&gsi, follow_single_use_edges);
return true;
}
}
return false;
gimple_assign_set_rhs1 (stmt, innerop);
- update_stmt (stmt);
+ gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
+ fold_stmt (&gsi, follow_single_use_edges);
return true;
}
conv = gimple_build_assign (tem, NOP_EXPR, rhs1);
gsi_insert_before (gsi, conv, GSI_SAME_STMT);
gimple_assign_set_rhs1 (stmt, tem);
- update_stmt (stmt);
+ fold_stmt (gsi, follow_single_use_edges);
return true;
}
new_rhs1,
new_rhs2);
update_stmt (gsi_stmt (*gsi));
+ fold_stmt (gsi, follow_single_use_edges);
return true;
}
}
projects / gcc.git / commitdiff