/* Miscellaneous SSA utility functions.
- Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GCC.
#include "function.h"
#include "diagnostic.h"
#include "bitmap.h"
+#include "pointer-set.h"
#include "tree-flow.h"
#include "tree-gimple.h"
#include "tree-inline.h"
#include "varray.h"
#include "timevar.h"
-#include "tree-alias-common.h"
#include "hashtab.h"
#include "tree-dump.h"
#include "tree-pass.h"
-
-/* Remove edge E and remove the corresponding arguments from the PHI nodes
- in E's destination block. */
-
-void
-ssa_remove_edge (edge e)
-{
- tree phi, next;
-
- /* Remove the appropriate PHI arguments in E's destination block. */
- for (phi = phi_nodes (e->dest); phi; phi = next)
- {
- next = TREE_CHAIN (phi);
- remove_phi_arg (phi, e->src);
- }
-
- remove_edge (e);
-}
-
-/* Remove remove the corresponding arguments from the PHI nodes
- in E's destination block and redirect it to DEST. Return redirected edge.
+/* Remove the corresponding arguments from the PHI nodes in E's
+ destination block and redirect it to DEST. Return redirected edge.
The list of removed arguments is stored in PENDING_STMT (e). */
edge
ssa_redirect_edge (edge e, basic_block dest)
{
- tree phi, next;
+ tree phi;
tree list = NULL, *last = &list;
tree src, dst, node;
- int i;
/* Remove the appropriate PHI arguments in E's destination block. */
- for (phi = phi_nodes (e->dest); phi; phi = next)
+ for (phi = phi_nodes (e->dest); phi; phi = PHI_CHAIN (phi))
{
- next = TREE_CHAIN (phi);
-
- i = phi_arg_from_edge (phi, e);
- if (i < 0)
+ if (PHI_ARG_DEF (phi, e->dest_idx) == NULL_TREE)
continue;
- src = PHI_ARG_DEF (phi, i);
+ src = PHI_ARG_DEF (phi, e->dest_idx);
dst = PHI_RESULT (phi);
node = build_tree_list (dst, src);
*last = node;
last = &TREE_CHAIN (node);
-
- remove_phi_arg_num (phi, i);
}
e = redirect_edge_succ_nodup (e, dest);
return e;
}
+/* Add PHI arguments queued in PENDINT_STMT list on edge E to edge
+ E->dest. */
-/* Return true if the definition of SSA_NAME at block BB is malformed.
+void
+flush_pending_stmts (edge e)
+{
+ tree phi, arg;
- STMT is the statement where SSA_NAME is created.
+ if (!PENDING_STMT (e))
+ return;
- DEFINITION_BLOCK is an array of basic blocks indexed by SSA_NAME version
- numbers. If DEFINITION_BLOCK[SSA_NAME_VERSION] is set, it means that the
- block in that array slot contains the definition of SSA_NAME. */
+ for (phi = phi_nodes (e->dest), arg = PENDING_STMT (e);
+ phi;
+ phi = PHI_CHAIN (phi), arg = TREE_CHAIN (arg))
+ {
+ tree def = TREE_VALUE (arg);
+ add_phi_arg (phi, def, e);
+ }
+
+ PENDING_STMT (e) = NULL;
+}
+
+/* Return true if SSA_NAME is malformed and mark it visited.
+
+ IS_VIRTUAL is true if this SSA_NAME was found inside a virtual
+ operand. */
static bool
-verify_def (basic_block bb, basic_block *definition_block, tree ssa_name,
- tree stmt)
+verify_ssa_name (tree ssa_name, bool is_virtual)
{
- bool err = false;
-
if (TREE_CODE (ssa_name) != SSA_NAME)
{
error ("Expected an SSA_NAME object");
- debug_generic_stmt (ssa_name);
- debug_generic_stmt (stmt);
+ return true;
+ }
+
+ if (TREE_TYPE (ssa_name) != TREE_TYPE (SSA_NAME_VAR (ssa_name)))
+ {
+ error ("Type mismatch between an SSA_NAME and its symbol.");
+ return true;
+ }
+
+ if (SSA_NAME_IN_FREE_LIST (ssa_name))
+ {
+ error ("Found an SSA_NAME that had been released into the free pool");
+ return true;
+ }
+
+ if (is_virtual && is_gimple_reg (ssa_name))
+ {
+ error ("Found a virtual definition for a GIMPLE register");
+ return true;
+ }
+
+ if (!is_virtual && !is_gimple_reg (ssa_name))
+ {
+ error ("Found a real definition for a non-register");
+ return true;
+ }
+
+ if (is_virtual && var_ann (SSA_NAME_VAR (ssa_name))
+ && get_subvars_for_var (SSA_NAME_VAR (ssa_name)) != NULL)
+ {
+ error ("Found real variable when subvariables should have appeared");
+ return true;
}
+ return false;
+}
+
+
+/* Return true if the definition of SSA_NAME at block BB is malformed.
+
+ STMT is the statement where SSA_NAME is created.
+
+ DEFINITION_BLOCK is an array of basic blocks indexed by SSA_NAME
+ version numbers. If DEFINITION_BLOCK[SSA_NAME_VERSION] is set,
+ it means that the block in that array slot contains the
+ definition of SSA_NAME.
+
+ IS_VIRTUAL is true if SSA_NAME is created by a V_MAY_DEF or a
+ V_MUST_DEF. */
+
+static bool
+verify_def (basic_block bb, basic_block *definition_block, tree ssa_name,
+ tree stmt, bool is_virtual)
+{
+ if (verify_ssa_name (ssa_name, is_virtual))
+ goto err;
+
if (definition_block[SSA_NAME_VERSION (ssa_name)])
{
error ("SSA_NAME created in two different blocks %i and %i",
definition_block[SSA_NAME_VERSION (ssa_name)]->index, bb->index);
- fprintf (stderr, "SSA_NAME: ");
- debug_generic_stmt (ssa_name);
- debug_generic_stmt (stmt);
- err = true;
+ goto err;
}
definition_block[SSA_NAME_VERSION (ssa_name)] = bb;
if (SSA_NAME_DEF_STMT (ssa_name) != stmt)
{
error ("SSA_NAME_DEF_STMT is wrong");
- fprintf (stderr, "SSA_NAME: ");
- debug_generic_stmt (ssa_name);
fprintf (stderr, "Expected definition statement:\n");
- debug_generic_stmt (SSA_NAME_DEF_STMT (ssa_name));
+ print_generic_stmt (stderr, SSA_NAME_DEF_STMT (ssa_name), TDF_VOPS);
fprintf (stderr, "\nActual definition statement:\n");
- debug_generic_stmt (stmt);
- err = true;
+ print_generic_stmt (stderr, stmt, TDF_VOPS);
+ goto err;
}
- return err;
+ return false;
+
+err:
+ fprintf (stderr, "while verifying SSA_NAME ");
+ print_generic_expr (stderr, ssa_name, 0);
+ fprintf (stderr, " in statement\n");
+ print_generic_stmt (stderr, stmt, TDF_VOPS);
+
+ return true;
}
CHECK_ABNORMAL is true if the caller wants to check whether this use
is flowing through an abnormal edge (only used when checking PHI
- arguments). */
+ arguments).
+
+ IS_VIRTUAL is true if SSA_NAME is created by a V_MAY_DEF or a
+ V_MUST_DEF.
+
+ If NAMES_DEFINED_IN_BB is not NULL, it contains a bitmap of ssa names
+ that are defined before STMT in basic block BB. */
static bool
-verify_use (basic_block bb, basic_block def_bb, tree ssa_name,
- tree stmt, bool check_abnormal)
+verify_use (basic_block bb, basic_block def_bb, use_operand_p use_p,
+ tree stmt, bool check_abnormal, bool is_virtual,
+ bitmap names_defined_in_bb)
{
bool err = false;
+ tree ssa_name = USE_FROM_PTR (use_p);
+
+ err = verify_ssa_name (ssa_name, is_virtual);
+
+ if (!TREE_VISITED (ssa_name))
+ if (verify_imm_links (stderr, ssa_name))
+ err = true;
+
+ TREE_VISITED (ssa_name) = 1;
- if (IS_EMPTY_STMT (SSA_NAME_DEF_STMT (ssa_name)))
- ; /* Nothing to do. */
+ if (IS_EMPTY_STMT (SSA_NAME_DEF_STMT (ssa_name))
+ && var_ann (SSA_NAME_VAR (ssa_name))->default_def == ssa_name)
+ ; /* Default definitions have empty statements. Nothing to do. */
else if (!def_bb)
{
error ("Missing definition");
def_bb->index, bb->index);
err = true;
}
+ else if (bb == def_bb
+ && names_defined_in_bb != NULL
+ && !bitmap_bit_p (names_defined_in_bb, SSA_NAME_VERSION (ssa_name)))
+ {
+ error ("Definition in block %i follows the use", def_bb->index);
+ err = true;
+ }
if (check_abnormal
&& !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ssa_name))
err = true;
}
+ /* Make sure the use is in an appropriate list by checking the previous
+ element to make sure it's the same. */
+ if (use_p->prev == NULL)
+ {
+ error ("No immediate_use list");
+ err = true;
+ }
+ else
+ {
+ tree listvar ;
+ if (use_p->prev->use == NULL)
+ listvar = use_p->prev->stmt;
+ else
+ listvar = USE_FROM_PTR (use_p->prev);
+ if (listvar != ssa_name)
+ {
+ error ("Wrong immediate use list");
+ err = true;
+ }
+ }
+
if (err)
{
fprintf (stderr, "for SSA_NAME: ");
- debug_generic_stmt (ssa_name);
- fprintf (stderr, "in statement:\n");
- debug_generic_stmt (stmt);
+ print_generic_expr (stderr, ssa_name, TDF_VOPS);
+ fprintf (stderr, " in statement:\n");
+ print_generic_stmt (stderr, stmt, TDF_VOPS);
}
return err;
/* Return true if any of the arguments for PHI node PHI at block BB is
malformed.
- IDOM contains immediate dominator information for the flowgraph.
-
DEFINITION_BLOCK is an array of basic blocks indexed by SSA_NAME version
numbers. If DEFINITION_BLOCK[SSA_NAME_VERSION] is set, it means that the
block in that array slot contains the definition of SSA_NAME. */
{
edge e;
bool err = false;
- int i, phi_num_args = PHI_NUM_ARGS (phi);
+ unsigned i, phi_num_args = PHI_NUM_ARGS (phi);
- /* Mark all the incoming edges. */
- for (e = bb->pred; e; e = e->pred_next)
- e->aux = (void *) 1;
+ if (EDGE_COUNT (bb->preds) != phi_num_args)
+ {
+ error ("Incoming edge count does not match number of PHI arguments\n");
+ err = true;
+ goto error;
+ }
for (i = 0; i < phi_num_args; i++)
{
- tree op = PHI_ARG_DEF (phi, i);
+ use_operand_p op_p = PHI_ARG_DEF_PTR (phi, i);
+ tree op = USE_FROM_PTR (op_p);
- e = PHI_ARG_EDGE (phi, i);
- if (TREE_CODE (op) == SSA_NAME)
- err |= verify_use (e->src, definition_block[SSA_NAME_VERSION (op)], op,
- phi, e->flags & EDGE_ABNORMAL);
+ e = EDGE_PRED (bb, i);
- if (e->dest != bb)
+ if (op == NULL_TREE)
{
- error ("Wrong edge %d->%d for PHI argument\n",
- e->src->index, e->dest->index, bb->index);
+ error ("PHI argument is missing for edge %d->%d\n",
+ e->src->index,
+ e->dest->index);
err = true;
+ goto error;
}
- if (e->aux == (void *) 0)
+ if (TREE_CODE (op) != SSA_NAME && !is_gimple_min_invariant (op))
{
- error ("PHI argument flowing through dead edge %d->%d\n",
- e->src->index, e->dest->index);
+ error ("PHI argument is not SSA_NAME, or invariant");
err = true;
}
- if (e->aux == (void *) 2)
+ if (TREE_CODE (op) == SSA_NAME)
+ err = verify_use (e->src, definition_block[SSA_NAME_VERSION (op)], op_p,
+ phi, e->flags & EDGE_ABNORMAL,
+ !is_gimple_reg (PHI_RESULT (phi)),
+ NULL);
+
+ if (e->dest != bb)
{
- error ("PHI argument duplicated for edge %d->%d\n", e->src->index,
- e->dest->index);
+ error ("Wrong edge %d->%d for PHI argument\n",
+ e->src->index, e->dest->index, bb->index);
err = true;
}
if (err)
{
fprintf (stderr, "PHI argument\n");
- debug_generic_stmt (op);
+ print_generic_stmt (stderr, op, TDF_VOPS);
+ goto error;
}
+ }
- e->aux = (void *) 2;
+error:
+ if (err)
+ {
+ fprintf (stderr, "for PHI node\n");
+ print_generic_stmt (stderr, phi, TDF_VOPS);
}
- for (e = bb->pred; e; e = e->pred_next)
+
+ return err;
+}
+
+
+static void
+verify_flow_insensitive_alias_info (void)
+{
+ size_t i;
+ tree var;
+ bitmap visited = BITMAP_ALLOC (NULL);
+
+ for (i = 0; i < num_referenced_vars; i++)
{
- if (e->aux != (void *) 2)
+ size_t j;
+ var_ann_t ann;
+ varray_type may_aliases;
+
+ var = referenced_var (i);
+ ann = var_ann (var);
+ may_aliases = ann->may_aliases;
+
+ for (j = 0; may_aliases && j < VARRAY_ACTIVE_SIZE (may_aliases); j++)
{
- error ("No argument flowing through edge %d->%d\n", e->src->index,
- e->dest->index);
- err = true;
+ tree alias = VARRAY_TREE (may_aliases, j);
+
+ bitmap_set_bit (visited, var_ann (alias)->uid);
+
+ if (!may_be_aliased (alias))
+ {
+ error ("Non-addressable variable inside an alias set.");
+ debug_variable (alias);
+ goto err;
+ }
}
- e->aux = (void *) 0;
}
- if (err)
+ for (i = 0; i < num_referenced_vars; i++)
{
- fprintf (stderr, "for PHI node\n");
- debug_generic_stmt (phi);
+ var_ann_t ann;
+
+ var = referenced_var (i);
+ ann = var_ann (var);
+
+ if (ann->mem_tag_kind == NOT_A_TAG
+ && ann->is_alias_tag
+ && !bitmap_bit_p (visited, ann->uid))
+ {
+ error ("Addressable variable that is an alias tag but is not in any alias set.");
+ goto err;
+ }
}
+ BITMAP_FREE (visited);
+ return;
- return err;
+err:
+ debug_variable (var);
+ internal_error ("verify_flow_insensitive_alias_info failed.");
+}
+
+
+static void
+verify_flow_sensitive_alias_info (void)
+{
+ size_t i;
+ tree ptr;
+
+ for (i = 1; i < num_ssa_names; i++)
+ {
+ tree var;
+ var_ann_t ann;
+ struct ptr_info_def *pi;
+
+
+ ptr = ssa_name (i);
+ if (!ptr)
+ continue;
+
+ /* We only care for pointers that are actually referenced in the
+ program. */
+ if (!POINTER_TYPE_P (TREE_TYPE (ptr)) || !TREE_VISITED (ptr))
+ continue;
+
+ /* RESULT_DECL is special. If it's a GIMPLE register, then it
+ is only written-to only once in the return statement.
+ Otherwise, aggregate RESULT_DECLs may be written-to more than
+ once in virtual operands. */
+ var = SSA_NAME_VAR (ptr);
+ if (TREE_CODE (var) == RESULT_DECL
+ && is_gimple_reg (ptr))
+ continue;
+
+ pi = SSA_NAME_PTR_INFO (ptr);
+ if (pi == NULL)
+ continue;
+
+ ann = var_ann (var);
+ if (pi->is_dereferenced && !pi->name_mem_tag && !ann->type_mem_tag)
+ {
+ error ("Dereferenced pointers should have a name or a type tag");
+ goto err;
+ }
+
+ if (pi->name_mem_tag
+ && !pi->pt_malloc
+ && (pi->pt_vars == NULL || bitmap_empty_p (pi->pt_vars)))
+ {
+ error ("Pointers with a memory tag, should have points-to sets or point to malloc");
+ goto err;
+ }
+
+ if (pi->value_escapes_p
+ && pi->name_mem_tag
+ && !is_call_clobbered (pi->name_mem_tag))
+ {
+ error ("Pointer escapes but its name tag is not call-clobbered.");
+ goto err;
+ }
+ }
+
+ return;
+
+err:
+ debug_variable (ptr);
+ internal_error ("verify_flow_sensitive_alias_info failed.");
+}
+
+DEF_VEC_P (bitmap);
+DEF_VEC_ALLOC_P (bitmap,heap);
+
+/* Verify that all name tags have different points to sets.
+ This algorithm takes advantage of the fact that every variable with the
+ same name tag must have the same points-to set.
+ So we check a single variable for each name tag, and verify that its
+ points-to set is different from every other points-to set for other name
+ tags.
+
+ Additionally, given a pointer P_i with name tag NMT and type tag
+ TMT, this function verified the alias set of TMT is a superset of
+ the alias set of NMT. */
+
+static void
+verify_name_tags (void)
+{
+ size_t i;
+ size_t j;
+ bitmap first, second;
+ VEC(tree,heap) *name_tag_reps = NULL;
+ VEC(bitmap,heap) *pt_vars_for_reps = NULL;
+ bitmap type_aliases = BITMAP_ALLOC (NULL);
+
+ /* First we compute the name tag representatives and their points-to sets. */
+ for (i = 0; i < num_ssa_names; i++)
+ {
+ struct ptr_info_def *pi;
+ tree tmt, ptr = ssa_name (i);
+
+ if (ptr == NULL_TREE)
+ continue;
+
+ pi = SSA_NAME_PTR_INFO (ptr);
+
+ if (!TREE_VISITED (ptr)
+ || !POINTER_TYPE_P (TREE_TYPE (ptr))
+ || !pi
+ || !pi->name_mem_tag
+ || TREE_VISITED (pi->name_mem_tag))
+ continue;
+
+ TREE_VISITED (pi->name_mem_tag) = 1;
+
+ if (pi->pt_vars == NULL)
+ continue;
+
+ VEC_safe_push (tree, heap, name_tag_reps, ptr);
+ VEC_safe_push (bitmap, heap, pt_vars_for_reps, pi->pt_vars);
+
+ /* Verify that alias set of PTR's type tag is a superset of the
+ alias set of PTR's name tag. */
+ tmt = var_ann (SSA_NAME_VAR (ptr))->type_mem_tag;
+ if (tmt)
+ {
+ size_t i;
+ varray_type aliases = var_ann (tmt)->may_aliases;
+ bitmap_clear (type_aliases);
+ for (i = 0; aliases && i < VARRAY_ACTIVE_SIZE (aliases); i++)
+ {
+ tree alias = VARRAY_TREE (aliases, i);
+ bitmap_set_bit (type_aliases, var_ann (alias)->uid);
+ }
+
+ /* When grouping, we may have added PTR's type tag into the
+ alias set of PTR's name tag. To prevent a false
+ positive, pretend that TMT is in its own alias set. */
+ bitmap_set_bit (type_aliases, var_ann (tmt)->uid);
+
+ if (bitmap_equal_p (type_aliases, pi->pt_vars))
+ continue;
+
+ if (!bitmap_intersect_compl_p (type_aliases, pi->pt_vars))
+ {
+ error ("Alias set of a pointer's type tag should be a superset of the corresponding name tag");
+ debug_variable (tmt);
+ debug_variable (pi->name_mem_tag);
+ goto err;
+ }
+ }
+ }
+
+ /* Now compare all the representative bitmaps with all other representative
+ bitmaps, to verify that they are all different. */
+ for (i = 0; VEC_iterate (bitmap, pt_vars_for_reps, i, first); i++)
+ {
+ for (j = i + 1; VEC_iterate (bitmap, pt_vars_for_reps, j, second); j++)
+ {
+ if (bitmap_equal_p (first, second))
+ {
+ error ("Two different pointers with identical points-to sets but different name tags");
+ debug_variable (VEC_index (tree, name_tag_reps, j));
+ goto err;
+ }
+ }
+ }
+
+ /* Lastly, clear out the visited flags. */
+ for (i = 0; i < num_ssa_names; i++)
+ {
+ if (ssa_name (i))
+ {
+ tree ptr = ssa_name (i);
+ struct ptr_info_def *pi = SSA_NAME_PTR_INFO (ptr);
+ if (!TREE_VISITED (ptr)
+ || !POINTER_TYPE_P (TREE_TYPE (ptr))
+ || !pi
+ || !pi->name_mem_tag)
+ continue;
+ TREE_VISITED (pi->name_mem_tag) = 0;
+ }
+ }
+
+ /* We do not have to free the bitmaps or trees in the vectors, as
+ they are not owned by us. */
+ VEC_free (bitmap, heap, pt_vars_for_reps);
+ VEC_free (tree, heap, name_tag_reps);
+ BITMAP_FREE (type_aliases);
+ return;
+
+err:
+ debug_variable (VEC_index (tree, name_tag_reps, i));
+ internal_error ("verify_name_tags failed");
+}
+
+
+/* Verify the consistency of aliasing information. */
+
+static void
+verify_alias_info (void)
+{
+ verify_flow_sensitive_alias_info ();
+ verify_name_tags ();
+ verify_flow_insensitive_alias_info ();
}
TODO: verify the variable annotations. */
void
-verify_ssa (void)
+verify_ssa (bool check_modified_stmt)
{
- bool err = false;
+ size_t i;
basic_block bb;
basic_block *definition_block = xcalloc (num_ssa_names, sizeof (basic_block));
+ ssa_op_iter iter;
+ tree op;
+ enum dom_state orig_dom_state = dom_computed[CDI_DOMINATORS];
+ bitmap names_defined_in_bb = BITMAP_ALLOC (NULL);
- timevar_push (TV_TREE_SSA_VERIFY);
-
- calculate_dominance_info (CDI_DOMINATORS);
+ gcc_assert (!need_ssa_update_p ());
- /* Verify and register all the SSA_NAME definitions found in the
- function. */
- FOR_EACH_BB (bb)
- {
- tree phi;
- block_stmt_iterator bsi;
+ verify_stmts ();
- for (phi = phi_nodes (bb); phi; phi = TREE_CHAIN (phi))
- err |= verify_def (bb, definition_block, PHI_RESULT (phi), phi);
+ timevar_push (TV_TREE_SSA_VERIFY);
- for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
+ /* Keep track of SSA names present in the IL. */
+ for (i = 1; i < num_ssa_names; i++)
+ {
+ tree name = ssa_name (i);
+ if (name)
{
tree stmt;
- stmt_ann_t ann;
- unsigned int j;
- v_may_def_optype v_may_defs;
- v_must_def_optype v_must_defs;
- def_optype defs;
-
- stmt = bsi_stmt (bsi);
- ann = stmt_ann (stmt);
- get_stmt_operands (stmt);
-
- v_may_defs = V_MAY_DEF_OPS (ann);
- if (ann->makes_aliased_stores && NUM_V_MAY_DEFS (v_may_defs) == 0)
- error ("Makes aliased stores, but no V_MAY_DEFS");
-
- for (j = 0; j < NUM_V_MAY_DEFS (v_may_defs); j++)
- {
- tree op = V_MAY_DEF_RESULT (v_may_defs, j);
- if (is_gimple_reg (op))
- {
- error ("Found a virtual definition for a GIMPLE register");
- debug_generic_stmt (op);
- debug_generic_stmt (stmt);
- err = true;
- }
- err |= verify_def (bb, definition_block, op, stmt);
- }
-
- v_must_defs = STMT_V_MUST_DEF_OPS (stmt);
- for (j = 0; j < NUM_V_MUST_DEFS (v_must_defs); j++)
- {
- tree op = V_MUST_DEF_OP (v_must_defs, j);
- if (is_gimple_reg (op))
- {
- error ("Found a virtual must-def for a GIMPLE register");
- debug_generic_stmt (op);
- debug_generic_stmt (stmt);
- err = true;
- }
- err |= verify_def (bb, definition_block, op, stmt);
- }
+ TREE_VISITED (name) = 0;
- defs = DEF_OPS (ann);
- for (j = 0; j < NUM_DEFS (defs); j++)
+ stmt = SSA_NAME_DEF_STMT (name);
+ if (!IS_EMPTY_STMT (stmt))
{
- tree op = DEF_OP (defs, j);
- if (TREE_CODE (op) == SSA_NAME && !is_gimple_reg (op))
- {
- error ("Found a real definition for a non-GIMPLE register");
- debug_generic_stmt (op);
- debug_generic_stmt (stmt);
- err = true;
- }
- err |= verify_def (bb, definition_block, op, stmt);
+ basic_block bb = bb_for_stmt (stmt);
+ verify_def (bb, definition_block,
+ name, stmt, !is_gimple_reg (name));
+
}
}
}
+ calculate_dominance_info (CDI_DOMINATORS);
/* Now verify all the uses and make sure they agree with the definitions
found in the previous pass. */
{
edge e;
tree phi;
+ edge_iterator ei;
block_stmt_iterator bsi;
/* Make sure that all edges have a clear 'aux' field. */
- for (e = bb->pred; e; e = e->pred_next)
+ FOR_EACH_EDGE (e, ei, bb->preds)
{
if (e->aux)
{
error ("AUX pointer initialized for edge %d->%d\n", e->src->index,
e->dest->index);
- err = true;
+ goto err;
}
}
/* Verify the arguments for every PHI node in the block. */
- for (phi = phi_nodes (bb); phi; phi = TREE_CHAIN (phi))
- err |= verify_phi_args (phi, bb, definition_block);
-
- /* Now verify all the uses and vuses in every statement of the block.
+ for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi))
+ {
+ if (verify_phi_args (phi, bb, definition_block))
+ goto err;
+ bitmap_set_bit (names_defined_in_bb,
+ SSA_NAME_VERSION (PHI_RESULT (phi)));
+ }
- Remember, the RHS of a V_MAY_DEF is a use as well. */
+ /* Now verify all the uses and vuses in every statement of the block. */
for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
{
tree stmt = bsi_stmt (bsi);
- stmt_ann_t ann = stmt_ann (stmt);
- unsigned int j;
- vuse_optype vuses;
- v_may_def_optype v_may_defs;
- use_optype uses;
-
- vuses = VUSE_OPS (ann);
- for (j = 0; j < NUM_VUSES (vuses); j++)
- {
- tree op = VUSE_OP (vuses, j);
+ use_operand_p use_p;
- if (is_gimple_reg (op))
- {
- error ("Found a virtual use for a GIMPLE register");
- debug_generic_stmt (op);
- debug_generic_stmt (stmt);
- err = true;
- }
- err |= verify_use (bb, definition_block[SSA_NAME_VERSION (op)],
- op, stmt, false);
+ if (check_modified_stmt && stmt_modified_p (stmt))
+ {
+ error ("Stmt (%p) marked modified after optimization pass : ",
+ (void *)stmt);
+ print_generic_stmt (stderr, stmt, TDF_VOPS);
+ goto err;
}
- v_may_defs = V_MAY_DEF_OPS (ann);
- for (j = 0; j < NUM_V_MAY_DEFS (v_may_defs); j++)
+ if (TREE_CODE (stmt) == MODIFY_EXPR
+ && TREE_CODE (TREE_OPERAND (stmt, 0)) != SSA_NAME)
{
- tree op = V_MAY_DEF_OP (v_may_defs, j);
+ tree lhs, base_address;
+
+ lhs = TREE_OPERAND (stmt, 0);
+ base_address = get_base_address (lhs);
- if (is_gimple_reg (op))
+ if (base_address
+ && SSA_VAR_P (base_address)
+ && ZERO_SSA_OPERANDS (stmt, SSA_OP_VMAYDEF|SSA_OP_VMUSTDEF))
{
- error ("Found a virtual use for a GIMPLE register");
- debug_generic_stmt (op);
- debug_generic_stmt (stmt);
- err = true;
+ error ("Statement makes a memory store, but has no "
+ "V_MAY_DEFS nor V_MUST_DEFS");
+ print_generic_stmt (stderr, stmt, TDF_VOPS);
+ goto err;
}
- err |= verify_use (bb, definition_block[SSA_NAME_VERSION (op)],
- op, stmt, false);
}
- uses = USE_OPS (ann);
- for (j = 0; j < NUM_USES (uses); j++)
+
+ if (stmt_ann (stmt)->makes_aliased_stores
+ && ZERO_SSA_OPERANDS (stmt, SSA_OP_VMAYDEF))
{
- tree op = USE_OP (uses, j);
+ error ("Statement makes aliased stores, but has no V_MAY_DEFS");
+ print_generic_stmt (stderr, stmt, TDF_VOPS);
+ goto err;
+ }
- if (TREE_CODE (op) == SSA_NAME && !is_gimple_reg (op))
- {
- error ("Found a real use of a non-GIMPLE register");
- debug_generic_stmt (op);
- debug_generic_stmt (stmt);
- err = true;
- }
- err |= verify_use (bb, definition_block[SSA_NAME_VERSION (op)],
- op, stmt, false);
+ FOR_EACH_SSA_USE_OPERAND (use_p, stmt, iter,
+ SSA_OP_ALL_USES | SSA_OP_ALL_KILLS)
+ {
+ op = USE_FROM_PTR (use_p);
+ if (verify_use (bb, definition_block[SSA_NAME_VERSION (op)],
+ use_p, stmt, false, !is_gimple_reg (op),
+ names_defined_in_bb))
+ goto err;
}
+
+ FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_ALL_DEFS)
+ bitmap_set_bit (names_defined_in_bb, SSA_NAME_VERSION (op));
}
+
+ bitmap_clear (names_defined_in_bb);
}
+ /* Finally, verify alias information. */
+ verify_alias_info ();
+
free (definition_block);
+ /* Restore the dominance information to its prior known state, so
+ that we do not perturb the compiler's subsequent behavior. */
+ if (orig_dom_state == DOM_NONE)
+ free_dominance_info (CDI_DOMINATORS);
+ else
+ dom_computed[CDI_DOMINATORS] = orig_dom_state;
+
+ BITMAP_FREE (names_defined_in_bb);
timevar_pop (TV_TREE_SSA_VERIFY);
+ return;
- if (err)
- internal_error ("verify_ssa failed.");
-}
-
-
-/* Set the USED bit in the annotation for T. */
-
-void
-set_is_used (tree t)
-{
- while (1)
- {
- if (SSA_VAR_P (t))
- break;
-
- switch (TREE_CODE (t))
- {
- case ARRAY_REF:
- case COMPONENT_REF:
- case REALPART_EXPR:
- case IMAGPART_EXPR:
- case BIT_FIELD_REF:
- case INDIRECT_REF:
- t = TREE_OPERAND (t, 0);
- break;
-
- default:
- return;
- }
- }
-
- if (TREE_CODE (t) == SSA_NAME)
- t = SSA_NAME_VAR (t);
-
- var_ann (t)->used = 1;
+err:
+ internal_error ("verify_ssa failed.");
}
init_tree_ssa (void)
{
VARRAY_TREE_INIT (referenced_vars, 20, "referenced_vars");
- call_clobbered_vars = BITMAP_XMALLOC ();
- init_ssa_operands ();
+ call_clobbered_vars = BITMAP_ALLOC (NULL);
+ addressable_vars = BITMAP_ALLOC (NULL);
init_ssanames ();
init_phinodes ();
global_var = NULL_TREE;
basic_block bb;
block_stmt_iterator bsi;
+ /* Release any ssa_names still in use. */
+ for (i = 0; i < num_ssa_names; i++)
+ {
+ tree var = ssa_name (i);
+ if (var && TREE_CODE (var) == SSA_NAME)
+ {
+ SSA_NAME_IMM_USE_NODE (var).prev = &(SSA_NAME_IMM_USE_NODE (var));
+ SSA_NAME_IMM_USE_NODE (var).next = &(SSA_NAME_IMM_USE_NODE (var));
+ }
+ release_ssa_name (var);
+ }
+
/* Remove annotations from every tree in the function. */
FOR_EACH_BB (bb)
for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
- bsi_stmt (bsi)->common.ann = NULL;
+ {
+ tree stmt = bsi_stmt (bsi);
+ ggc_free (stmt->common.ann);
+ stmt->common.ann = NULL;
+ }
/* Remove annotations from every referenced variable. */
if (referenced_vars)
{
for (i = 0; i < num_referenced_vars; i++)
- referenced_var (i)->common.ann = NULL;
+ {
+ tree var = referenced_var (i);
+ ggc_free (var->common.ann);
+ var->common.ann = NULL;
+ }
referenced_vars = NULL;
}
fini_ssanames ();
fini_phinodes ();
- fini_ssa_operands ();
global_var = NULL_TREE;
- BITMAP_XFREE (call_clobbered_vars);
+ BITMAP_FREE (call_clobbered_vars);
call_clobbered_vars = NULL;
+ BITMAP_FREE (addressable_vars);
+ addressable_vars = NULL;
+ modified_noreturn_calls = NULL;
aliases_computed_p = false;
+ gcc_assert (!need_ssa_update_p ());
}
bool
tree_ssa_useless_type_conversion_1 (tree outer_type, tree inner_type)
{
+ if (inner_type == outer_type)
+ return true;
+
+ /* Changes in machine mode are never useless conversions. */
+ if (TYPE_MODE (inner_type) != TYPE_MODE (outer_type))
+ return false;
+
/* If the inner and outer types are effectively the same, then
strip the type conversion and enter the equivalence into
the table. */
- if (inner_type == outer_type
- || (lang_hooks.types_compatible_p (inner_type, outer_type)))
+ if (lang_hooks.types_compatible_p (inner_type, outer_type))
return true;
/* If both types are pointers and the outer type is a (void *), then
implement the ABI. */
else if (POINTER_TYPE_P (inner_type)
&& POINTER_TYPE_P (outer_type)
+ && TYPE_REF_CAN_ALIAS_ALL (inner_type)
+ == TYPE_REF_CAN_ALIAS_ALL (outer_type)
&& TREE_CODE (TREE_TYPE (outer_type)) == VOID_TYPE)
return true;
so strip conversions that just switch between them. */
else if (POINTER_TYPE_P (inner_type)
&& POINTER_TYPE_P (outer_type)
+ && TYPE_REF_CAN_ALIAS_ALL (inner_type)
+ == TYPE_REF_CAN_ALIAS_ALL (outer_type)
&& lang_hooks.types_compatible_p (TREE_TYPE (inner_type),
TREE_TYPE (outer_type)))
return true;
/* If both the inner and outer types are integral types, then the
conversion is not necessary if they have the same mode and
- signedness and precision. Note that type _Bool can have size of
- 4 (only happens on powerpc-darwin right now but can happen on any
- target that defines BOOL_TYPE_SIZE to be INT_TYPE_SIZE) and a
- precision of 1 while unsigned int is the same expect for a
- precision of 4 so testing of precision is necessary. */
+ signedness and precision, and both or neither are boolean. Some
+ code assumes an invariant that boolean types stay boolean and do
+ not become 1-bit bit-field types. Note that types with precision
+ not using all bits of the mode (such as bit-field types in C)
+ mean that testing of precision is necessary. */
else if (INTEGRAL_TYPE_P (inner_type)
&& INTEGRAL_TYPE_P (outer_type)
- && TYPE_MODE (inner_type) == TYPE_MODE (outer_type)
&& TYPE_UNSIGNED (inner_type) == TYPE_UNSIGNED (outer_type)
&& TYPE_PRECISION (inner_type) == TYPE_PRECISION (outer_type))
- return true;
+ {
+ bool first_boolean = (TREE_CODE (inner_type) == BOOLEAN_TYPE);
+ bool second_boolean = (TREE_CODE (outer_type) == BOOLEAN_TYPE);
+ if (first_boolean == second_boolean)
+ return true;
+ }
/* Recurse for complex types. */
else if (TREE_CODE (inner_type) == COMPLEX_TYPE
the top of the RHS to the type of the LHS and the type conversion
is "safe", then strip away the type conversion so that we can
enter LHS = RHS into the const_and_copies table. */
- if (TREE_CODE (expr) == NOP_EXPR || TREE_CODE (expr) == CONVERT_EXPR)
+ if (TREE_CODE (expr) == NOP_EXPR || TREE_CODE (expr) == CONVERT_EXPR
+ || TREE_CODE (expr) == VIEW_CONVERT_EXPR
+ || TREE_CODE (expr) == NON_LVALUE_EXPR)
return tree_ssa_useless_type_conversion_1 (TREE_TYPE (expr),
TREE_TYPE (TREE_OPERAND (expr,
0)));
return false;
}
+/* Returns true if statement STMT may read memory. */
+
+bool
+stmt_references_memory_p (tree stmt)
+{
+ stmt_ann_t ann = stmt_ann (stmt);
+
+ if (ann->has_volatile_ops)
+ return true;
+
+ return (!ZERO_SSA_OPERANDS (stmt, SSA_OP_ALL_VIRTUALS));
+}
/* Internal helper for walk_use_def_chains. VAR, FN and DATA are as
- described in walk_use_def_chains. VISITED is a bitmap used to mark
- visited SSA_NAMEs to avoid infinite loops. */
+ described in walk_use_def_chains.
+
+ VISITED is a pointer set used to mark visited SSA_NAMEs to avoid
+ infinite loops. We used to have a bitmap for this to just mark
+ SSA versions we had visited. But non-sparse bitmaps are way too
+ expensive, while sparse bitmaps may cause quadratic behavior.
+
+ IS_DFS is true if the caller wants to perform a depth-first search
+ when visiting PHI nodes. A DFS will visit each PHI argument and
+ call FN after each one. Otherwise, all the arguments are
+ visited first and then FN is called with each of the visited
+ arguments in a separate pass. */
static bool
walk_use_def_chains_1 (tree var, walk_use_def_chains_fn fn, void *data,
- bitmap visited)
+ struct pointer_set_t *visited, bool is_dfs)
{
tree def_stmt;
- if (bitmap_bit_p (visited, SSA_NAME_VERSION (var)))
+ if (pointer_set_insert (visited, var))
return false;
- bitmap_set_bit (visited, SSA_NAME_VERSION (var));
-
def_stmt = SSA_NAME_DEF_STMT (var);
if (TREE_CODE (def_stmt) != PHI_NODE)
{
/* If we reached the end of the use-def chain, call FN. */
- return (*fn) (var, def_stmt, data);
+ return fn (var, def_stmt, data);
}
else
{
int i;
- /* Otherwise, follow use-def links out of each PHI argument and call
- FN after visiting each one. */
+ /* When doing a breadth-first search, call FN before following the
+ use-def links for each argument. */
+ if (!is_dfs)
+ for (i = 0; i < PHI_NUM_ARGS (def_stmt); i++)
+ if (fn (PHI_ARG_DEF (def_stmt, i), def_stmt, data))
+ return true;
+
+ /* Follow use-def links out of each PHI argument. */
for (i = 0; i < PHI_NUM_ARGS (def_stmt); i++)
{
tree arg = PHI_ARG_DEF (def_stmt, i);
if (TREE_CODE (arg) == SSA_NAME
- && walk_use_def_chains_1 (arg, fn, data, visited))
- return true;
-
- if ((*fn) (arg, def_stmt, data))
+ && walk_use_def_chains_1 (arg, fn, data, visited, is_dfs))
return true;
}
+
+ /* When doing a depth-first search, call FN after following the
+ use-def links for each argument. */
+ if (is_dfs)
+ for (i = 0; i < PHI_NUM_ARGS (def_stmt); i++)
+ if (fn (PHI_ARG_DEF (def_stmt, i), def_stmt, data))
+ return true;
}
+
return false;
}
-/* Walk use-def chains starting at the SSA variable VAR. Call function FN
- at each reaching definition found. FN takes three arguments: VAR, its
- defining statement (DEF_STMT) and a generic pointer to whatever state
- information that FN may want to maintain (DATA). FN is able to stop the
- walk by returning true, otherwise in order to continue the walk, FN
- should return false.
+/* Walk use-def chains starting at the SSA variable VAR. Call
+ function FN at each reaching definition found. FN takes three
+ arguments: VAR, its defining statement (DEF_STMT) and a generic
+ pointer to whatever state information that FN may want to maintain
+ (DATA). FN is able to stop the walk by returning true, otherwise
+ in order to continue the walk, FN should return false.
Note, that if DEF_STMT is a PHI node, the semantics are slightly
- different. For each argument ARG of the PHI node, this function will:
+ different. The first argument to FN is no longer the original
+ variable VAR, but the PHI argument currently being examined. If FN
+ wants to get at VAR, it should call PHI_RESULT (PHI).
+
+ If IS_DFS is true, this function will:
+
+ 1- walk the use-def chains for all the PHI arguments, and,
+ 2- call (*FN) (ARG, PHI, DATA) on all the PHI arguments.
- 1- Walk the use-def chains for ARG.
- 2- Call (*FN) (ARG, PHI, DATA).
+ If IS_DFS is false, the two steps above are done in reverse order
+ (i.e., a breadth-first search). */
- Note how the first argument to FN is no longer the original variable
- VAR, but the PHI argument currently being examined. If FN wants to get
- at VAR, it should call PHI_RESULT (PHI). */
void
-walk_use_def_chains (tree var, walk_use_def_chains_fn fn, void *data)
+walk_use_def_chains (tree var, walk_use_def_chains_fn fn, void *data,
+ bool is_dfs)
{
tree def_stmt;
-#if defined ENABLE_CHECKING
- if (TREE_CODE (var) != SSA_NAME)
- abort ();
-#endif
+ gcc_assert (TREE_CODE (var) == SSA_NAME);
def_stmt = SSA_NAME_DEF_STMT (var);
(*fn) (var, def_stmt, data);
else
{
- bitmap visited = BITMAP_XMALLOC ();
- walk_use_def_chains_1 (var, fn, data, visited);
- BITMAP_XFREE (visited);
- }
-}
-
-
-/* Replaces immediate uses of VAR by REPL. */
-
-static void
-replace_immediate_uses (tree var, tree repl)
-{
- use_optype uses;
- vuse_optype vuses;
- v_may_def_optype v_may_defs;
- int i, j, n;
- dataflow_t df;
- tree stmt;
- stmt_ann_t ann;
-
- df = get_immediate_uses (SSA_NAME_DEF_STMT (var));
- n = num_immediate_uses (df);
-
- for (i = 0; i < n; i++)
- {
- stmt = immediate_use (df, i);
- ann = stmt_ann (stmt);
-
- if (TREE_CODE (stmt) == PHI_NODE)
- {
- for (j = 0; j < PHI_NUM_ARGS (stmt); j++)
- if (PHI_ARG_DEF (stmt, j) == var)
- {
- PHI_ARG_DEF (stmt, j) = repl;
- if (TREE_CODE (repl) == SSA_NAME
- && PHI_ARG_EDGE (stmt, j)->flags & EDGE_ABNORMAL)
- SSA_NAME_OCCURS_IN_ABNORMAL_PHI (repl) = 1;
- }
-
- continue;
- }
-
- get_stmt_operands (stmt);
- if (is_gimple_reg (SSA_NAME_VAR (var)))
- {
- uses = USE_OPS (ann);
- for (j = 0; j < (int) NUM_USES (uses); j++)
- if (USE_OP (uses, j) == var)
- propagate_value (USE_OP_PTR (uses, j), repl);
- }
- else
- {
- vuses = VUSE_OPS (ann);
- for (j = 0; j < (int) NUM_VUSES (vuses); j++)
- if (VUSE_OP (vuses, j) == var)
- propagate_value (VUSE_OP_PTR (vuses, j), repl);
-
- v_may_defs = V_MAY_DEF_OPS (ann);
- for (j = 0; j < (int) NUM_V_MAY_DEFS (v_may_defs); j++)
- if (V_MAY_DEF_OP (v_may_defs, j) == var)
- propagate_value (V_MAY_DEF_OP_PTR (v_may_defs, j), repl);
- }
-
- modify_stmt (stmt);
-
- /* If REPL is a pointer, it may have different memory tags associated
- with it. For instance, VAR may have had a name tag while REPL
- only had a type tag. In these cases, the virtual operands (if
- any) in the statement will refer to different symbols which need
- to be renamed. */
- if (POINTER_TYPE_P (TREE_TYPE (repl)))
- mark_new_vars_to_rename (stmt, vars_to_rename);
- }
-}
-
-/* Raises value of phi node PHI by joining it with VAL. Processes immediate
- uses of PHI recursively. */
-
-static void
-raise_value (tree phi, tree val, tree *eq_to)
-{
- int i, n;
- tree var = PHI_RESULT (phi), stmt;
- int ver = SSA_NAME_VERSION (var);
- dataflow_t df;
-
- if (eq_to[ver] == var)
- return;
-
- switch (TREE_CODE (val))
- {
- case SSA_NAME:
- case REAL_CST:
- case COMPLEX_CST:
- break;
- case INTEGER_CST:
- if (TREE_CODE (TREE_TYPE (var)) != POINTER_TYPE)
- break;
-
- default:
- /* Do not propagate pointer constants. This might require folding
- things like *&foo and rewriting the ssa, which is not worth the
- trouble. */
- val = var;
- }
-
- if (eq_to[ver])
- {
- if (operand_equal_p (eq_to[ver], val, 0))
- return;
-
- eq_to[ver] = var;
- }
- else
- eq_to[ver] = val;
-
- df = get_immediate_uses (SSA_NAME_DEF_STMT (var));
- n = num_immediate_uses (df);
-
- for (i = 0; i < n; i++)
- {
- stmt = immediate_use (df, i);
-
- if (TREE_CODE (stmt) != PHI_NODE)
- continue;
-
- raise_value (stmt, eq_to[ver], eq_to);
+ struct pointer_set_t *visited = pointer_set_create ();
+ walk_use_def_chains_1 (var, fn, data, visited, is_dfs);
+ pointer_set_destroy (visited);
}
}
-/* Removes redundant phi nodes.
-
- A redundant PHI node is a PHI node where all of its PHI arguments
- are the same value, excluding any PHI arguments which are the same
- as the PHI result.
-
- A redundant PHI node is effectively a copy, so we forward copy propagate
- which removes all uses of the destination of the PHI node then
- finally we delete the redundant PHI node.
-
- Note that if we can not copy propagate the PHI node, then the PHI
- will not be removed. Thus we do not have to worry about dependencies
- between PHIs and the problems serializing PHIs into copies creates.
-
- The most important effect of this pass is to remove degenerate PHI
- nodes created by removing unreachable code. */
-
-static void
-kill_redundant_phi_nodes (void)
-{
- tree *eq_to;
- unsigned i;
- basic_block bb;
- tree phi, t, stmt, var;
-
- /* The EQ_TO array holds the current value of the ssa name in the
- lattice:
-
- top
- / | \
- const variables
- \ | /
- bottom
-
- Bottom is represented by NULL and top by the variable itself.
-
- Once the dataflow stabilizes, we know that the phi nodes we need to keep
- are exactly those with top as their result.
-
- The remaining phi nodes have their uses replaced with their value
- in the lattice and the phi node itself is removed. */
- eq_to = xcalloc (num_ssa_names, sizeof (tree));
-
- /* We have had cases where computing immediate uses takes a
- significant amount of compile time. If we run into such
- problems here, we may want to only compute immediate uses for
- a subset of all the SSA_NAMEs instead of computing it for
- all of the SSA_NAMEs. */
- compute_immediate_uses (TDFA_USE_OPS | TDFA_USE_VOPS, NULL);
-
- FOR_EACH_BB (bb)
- {
- for (phi = phi_nodes (bb); phi; phi = TREE_CHAIN (phi))
- {
- var = PHI_RESULT (phi);
-
- for (i = 0; i < (unsigned) PHI_NUM_ARGS (phi); i++)
- {
- t = PHI_ARG_DEF (phi, i);
-
- if (TREE_CODE (t) != SSA_NAME)
- {
- raise_value (phi, t, eq_to);
- continue;
- }
-
- stmt = SSA_NAME_DEF_STMT (t);
-
- /* If the defining statement for this argument is not a
- phi node or the argument is associated with an abnormal
- edge, then we need to recursively start the forward
- dataflow starting with PHI. */
- if (TREE_CODE (stmt) != PHI_NODE
- || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (t))
- {
- eq_to[SSA_NAME_VERSION (t)] = t;
- raise_value (phi, t, eq_to);
- }
- }
- }
- }
-
- /* Now propagate the values. */
- for (i = 0; i < num_ssa_names; i++)
- if (eq_to[i]
- && eq_to[i] != ssa_name (i))
- replace_immediate_uses (ssa_name (i), eq_to[i]);
-
- /* And remove the dead phis. */
- for (i = 0; i < num_ssa_names; i++)
- if (eq_to[i]
- && eq_to[i] != ssa_name (i))
- {
- stmt = SSA_NAME_DEF_STMT (ssa_name (i));
- remove_phi_node (stmt, 0, bb_for_stmt (stmt));
- }
-
- free_df ();
- free (eq_to);
-}
-
-struct tree_opt_pass pass_redundant_phi =
-{
- "redphi", /* name */
- NULL, /* gate */
- kill_redundant_phi_nodes, /* execute */
- NULL, /* sub */
- NULL, /* next */
- 0, /* static_pass_number */
- 0, /* tv_id */
- PROP_cfg | PROP_ssa, /* properties_required */
- 0, /* properties_provided */
- 0, /* properties_destroyed */
- 0, /* todo_flags_start */
- TODO_dump_func | TODO_rename_vars
- | TODO_ggc_collect | TODO_verify_ssa /* todo_flags_finish */
-};
\f
/* Emit warnings for uninitialized variables. This is done in two passes.
warning text is in MSGID and LOCUS may contain a location or be null. */
static void
-warn_uninit (tree t, const char *msgid, location_t *locus)
+warn_uninit (tree t, const char *msgid, void *data)
{
tree var = SSA_NAME_VAR (t);
tree def = SSA_NAME_DEF_STMT (t);
+ tree context = (tree) data;
+ location_t * locus;
/* Default uses (indicated by an empty definition statement),
are uninitialized. */
return;
/* Hard register variables get their initial value from the ether. */
- if (DECL_HARD_REGISTER (var))
+ if (TREE_CODE (var) == VAR_DECL && DECL_HARD_REGISTER (var))
return;
/* TREE_NO_WARNING either means we already warned, or the front end
if (TREE_NO_WARNING (var))
return;
- if (!locus)
- locus = &DECL_SOURCE_LOCATION (var);
- warning (msgid, locus, var);
+ locus = (context != NULL && EXPR_HAS_LOCATION (context)
+ ? EXPR_LOCUS (context)
+ : &DECL_SOURCE_LOCATION (var));
+ warning (0, msgid, locus, var);
TREE_NO_WARNING (var) = 1;
}
static tree
warn_uninitialized_var (tree *tp, int *walk_subtrees, void *data)
{
- location_t *locus = data;
tree t = *tp;
/* We only do data flow with SSA_NAMEs, so that's all we can warn about. */
if (TREE_CODE (t) == SSA_NAME)
{
- warn_uninit (t, "%H'%D' is used uninitialized in this function", locus);
+ warn_uninit (t, "%H%qD is used uninitialized in this function", data);
*walk_subtrees = 0;
}
- else if (DECL_P (t) || TYPE_P (t))
+ else if (IS_TYPE_OR_DECL_P (t))
*walk_subtrees = 0;
return NULL_TREE;
{
tree op = PHI_ARG_DEF (phi, i);
if (TREE_CODE (op) == SSA_NAME)
- warn_uninit (op, "%H'%D' may be used uninitialized in this function",
+ warn_uninit (op, "%H%qD may be used uninitialized in this function",
NULL);
}
}
FOR_EACH_BB (bb)
for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
- walk_tree (bsi_stmt_ptr (bsi), warn_uninitialized_var,
- EXPR_LOCUS (bsi_stmt (bsi)), NULL);
+ {
+ tree context = bsi_stmt (bsi);
+ walk_tree (bsi_stmt_ptr (bsi), warn_uninitialized_var,
+ context, NULL);
+ }
}
static void
execute_early_warn_uninitialized ();
FOR_EACH_BB (bb)
- for (phi = phi_nodes (bb); phi; phi = TREE_CHAIN (phi))
+ for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi))
warn_uninitialized_phi (phi);
}
0, /* properties_provided */
0, /* properties_destroyed */
0, /* todo_flags_start */
- 0 /* todo_flags_finish */
+ 0, /* todo_flags_finish */
+ 0 /* letter */
};
struct tree_opt_pass pass_late_warn_uninitialized =
0, /* properties_provided */
0, /* properties_destroyed */
0, /* todo_flags_start */
- 0 /* todo_flags_finish */
+ 0, /* todo_flags_finish */
+ 0 /* letter */
};
+
OSDN Git Service
