* doc/extend.texi (Common Function Attributes): Mention that
noreturn suppresses tail call optimization.
+2018-09-21 Jeff Law <law@redhat.com>
+
+ * gimple-ssa-evrp.c (evrp_dom_walker::cleanup): Call
+ vr_values::cleanup_edges_and_switches.
+ * tree-vrp.c (to_remove_edges, to_update_switch_stmts): Moved into
+ vr_values class.
+ (identify_jump_threads): Remove EDGE_IGNORE handling.
+ (execute_vrp): Move handling of to_remove_edges and
+ to_update_switch_stmts into vr_values class member functions.
+ * tree-vrp.h (switch_update, to_remove_edges): Remove declarations.
+ (to_update_switch_stmts): Likewise.
+ * vr-values.c: Include cfghooks.h.
+ (vr_values::vr_values): Initialize to_remove_edges and
+ to_update_switch_stmts.
+ (vr_values::~vr_values): Verify to_remove_edges and
+ to_update_switch_stmts are empty.
+ (vr_values::simplify_switch_using_ranges): Set EDGE_IGNORE as needed.
+ (vr_values::cleanup_edges_and_switches): New member function.
+ * vr-values.h (vr_values): Add cleanup_edges_and_switches member
+ function. Add new data members.
+
2018-09-21 David Malcolm <dmalcolm@redhat.com>
PR tree-optimization/87309
gimple *stmt = stmts_to_fixup.pop ();
fixup_noreturn_call (stmt);
}
+
+ evrp_folder.vr_values->cleanup_edges_and_switches ();
}
/* Main entry point for the early vrp pass which is a simplified non-iterative
+2018-09-21 Jeff Law <law@redhat.com>
+
+ * gcc.dg/tree-ssa/vrp113.c: Disable EVRP.
+ * gcc.dg/tree-ssa/vrp120.c: New test.
+
2018-09-21 Marek Polacek <polacek@redhat.com>
PR c++/87372 - __func__ constexpr evaluation.
/* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-vrp1" } */
+/* { dg-options "-O2 -fdump-tree-vrp1 -fdisable-tree-evrp" } */
int f(int a) {
switch (a & 1) {
--- /dev/null
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-evrp" } */
+#include "vrp113.c"
+
+/* { dg-final { scan-tree-dump "return 3;" "evrp" } } */
ASSERT_EXPRs for SSA name N_I should be inserted. */
static assert_locus **asserts_for;
-vec<edge> to_remove_edges;
-vec<switch_update> to_update_switch_stmts;
-
-
/* Return the maximum value for TYPE. */
tree
static void
identify_jump_threads (class vr_values *vr_values)
{
- int i;
- edge e;
-
/* Ugh. When substituting values earlier in this pass we can
wipe the dominance information. So rebuild the dominator
information as we need it within the jump threading code. */
recompute it. */
mark_dfs_back_edges ();
- /* Do not thread across edges we are about to remove. Just marking
- them as EDGE_IGNORE will do. */
- FOR_EACH_VEC_ELT (to_remove_edges, i, e)
- e->flags |= EDGE_IGNORE;
-
/* Allocate our unwinder stack to unwind any temporary equivalences
that might be recorded. */
const_and_copies *equiv_stack = new const_and_copies ();
walker.vr_values = vr_values;
walker.walk (cfun->cfg->x_entry_block_ptr);
- /* Clear EDGE_IGNORE. */
- FOR_EACH_VEC_ELT (to_remove_edges, i, e)
- e->flags &= ~EDGE_IGNORE;
-
/* We do not actually update the CFG or SSA graphs at this point as
ASSERT_EXPRs are still in the IL and cfg cleanup code does not yet
handle ASSERT_EXPRs gracefully. */
static unsigned int
execute_vrp (bool warn_array_bounds_p)
{
- int i;
- edge e;
- switch_update *su;
loop_optimizer_init (LOOPS_NORMAL | LOOPS_HAVE_RECORDED_EXITS);
rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa);
EDGE_DFS_BACK. */
insert_range_assertions ();
- to_remove_edges.create (10);
- to_update_switch_stmts.create (5);
threadedge_initialize_values ();
/* For visiting PHI nodes we need EDGE_DFS_BACK computed. */
processing by the pass manager. */
thread_through_all_blocks (false);
- /* Remove dead edges from SWITCH_EXPR optimization. This leaves the
- CFG in a broken state and requires a cfg_cleanup run. */
- FOR_EACH_VEC_ELT (to_remove_edges, i, e)
- remove_edge (e);
- /* Update SWITCH_EXPR case label vector. */
- FOR_EACH_VEC_ELT (to_update_switch_stmts, i, su)
- {
- size_t j;
- size_t n = TREE_VEC_LENGTH (su->vec);
- tree label;
- gimple_switch_set_num_labels (su->stmt, n);
- for (j = 0; j < n; j++)
- gimple_switch_set_label (su->stmt, j, TREE_VEC_ELT (su->vec, j));
- /* As we may have replaced the default label with a regular one
- make sure to make it a real default label again. This ensures
- optimal expansion. */
- label = gimple_switch_label (su->stmt, 0);
- CASE_LOW (label) = NULL_TREE;
- CASE_HIGH (label) = NULL_TREE;
- }
-
- if (to_remove_edges.length () > 0)
- {
- free_dominance_info (CDI_DOMINATORS);
- loops_state_set (LOOPS_NEED_FIXUP);
- }
-
- to_remove_edges.release ();
- to_update_switch_stmts.release ();
+ vrp_prop.vr_values.cleanup_edges_and_switches ();
threadedge_finalize_values ();
scev_finalize ();
extern tree get_single_symbol (tree, bool *, tree *);
extern void maybe_set_nonzero_bits (edge, tree);
extern value_range_type determine_value_range (tree, wide_int *, wide_int *);
-
-struct switch_update {
- gswitch *stmt;
- tree vec;
-};
-
-extern vec<edge> to_remove_edges;
-extern vec<switch_update> to_update_switch_stmts;
-
#endif /* GCC_TREE_VRP_H */
#include "alloc-pool.h"
#include "attribs.h"
#include "vr-values.h"
+#include "cfghooks.h"
/* Set value range VR to a non-negative range of type TYPE. */
vr_value = XCNEWVEC (value_range *, num_vr_values);
vr_phi_edge_counts = XCNEWVEC (int, num_ssa_names);
bitmap_obstack_initialize (&vrp_equiv_obstack);
+ to_remove_edges.create (10);
+ to_update_switch_stmts.create (5);
}
/* Free VRP lattice. */
and not available. */
vr_value = NULL;
vr_phi_edge_counts = NULL;
+
+ /* If there are entries left in TO_REMOVE_EDGES or TO_UPDATE_SWITCH_STMTS
+ then an EVRP client did not clean up properly. Catch it now rather
+ than seeing something more obscure later. */
+ gcc_assert (to_remove_edges.is_empty ()
+ && to_update_switch_stmts.is_empty ());
}
}
to_remove_edges.safe_push (e);
e->flags &= ~EDGE_EXECUTABLE;
+ e->flags |= EDGE_IGNORE;
}
/* And queue an update for the stmt. */
return false;
}
+void
+vr_values::cleanup_edges_and_switches (void)
+{
+ int i;
+ edge e;
+ switch_update *su;
+
+ /* Remove dead edges from SWITCH_EXPR optimization. This leaves the
+ CFG in a broken state and requires a cfg_cleanup run. */
+ FOR_EACH_VEC_ELT (to_remove_edges, i, e)
+ remove_edge (e);
+
+ /* Update SWITCH_EXPR case label vector. */
+ FOR_EACH_VEC_ELT (to_update_switch_stmts, i, su)
+ {
+ size_t j;
+ size_t n = TREE_VEC_LENGTH (su->vec);
+ tree label;
+ gimple_switch_set_num_labels (su->stmt, n);
+ for (j = 0; j < n; j++)
+ gimple_switch_set_label (su->stmt, j, TREE_VEC_ELT (su->vec, j));
+ /* As we may have replaced the default label with a regular one
+ make sure to make it a real default label again. This ensures
+ optimal expansion. */
+ label = gimple_switch_label (su->stmt, 0);
+ CASE_LOW (label) = NULL_TREE;
+ CASE_HIGH (label) = NULL_TREE;
+ }
+
+ if (!to_remove_edges.is_empty ())
+ {
+ free_dominance_info (CDI_DOMINATORS);
+ loops_state_set (LOOPS_NEED_FIXUP);
+ }
+
+ to_remove_edges.release ();
+ to_update_switch_stmts.release ();
+}
+
/* Simplify an integral conversion from an SSA name in STMT. */
static bool
value_range *allocate_value_range (void)
{ return vrp_value_range_pool.allocate (); }
+ /* */
+ void cleanup_edges_and_switches (void);
+
private:
void add_equivalence (bitmap *, const_tree);
bool vrp_stmt_computes_nonzero (gimple *);
number of executable edges we saw the last time we visited the
node. */
int *vr_phi_edge_counts;
+
+ /* Vectors of edges that need removing and switch statements that
+ need updating. It is expected that a pass using the simplification
+ routines will, at the end of the pass, clean up the edges and
+ switch statements. The class dtor will try to detect cases
+ that do not follow that expectation. */
+ struct switch_update {
+ gswitch *stmt;
+ tree vec;
+ };
+
+ vec<edge> to_remove_edges;
+ vec<switch_update> to_update_switch_stmts;
};
#define VR_INITIALIZER { VR_UNDEFINED, NULL_TREE, NULL_TREE, NULL }
projects / gcc.git / commitdiff