ann = var_ann (var);
if (!MTAG_P (var)
- && ann->is_alias_tag
+ && ann->is_aliased
&& !bitmap_bit_p (visited, DECL_UID (var)))
{
- error ("addressable variable that is an alias tag but is not in any alias set");
+ error ("addressable variable that is aliased but is not in any alias set");
goto err;
}
}
continue;
ann = var_ann (var);
- if (pi->is_dereferenced && !pi->name_mem_tag && !ann->type_mem_tag)
+ if (pi->is_dereferenced && !pi->name_mem_tag && !ann->symbol_mem_tag)
{
- error ("dereferenced pointers should have a name or a type tag");
+ error ("dereferenced pointers should have a name or a symbol tag");
goto err;
}
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
+ Additionally, given a pointer P_i with name tag NMT and symbol tag
+ SMT, this function verified the alias set of SMT is a superset of
the alias set of NMT. */
static void
for (i = 0; i < num_ssa_names; i++)
{
struct ptr_info_def *pi;
- tree tmt, ptr = ssa_name (i);
+ tree smt, ptr = ssa_name (i);
if (ptr == NULL_TREE)
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
+ /* Verify that alias set of PTR's symbol 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)
+ smt = var_ann (SSA_NAME_VAR (ptr))->symbol_mem_tag;
+ if (smt)
{
size_t i;
- VEC(tree,gc) *aliases = var_ann (tmt)->may_aliases;
+ VEC(tree,gc) *aliases = var_ann (smt)->may_aliases;
tree alias;
bitmap_clear (type_aliases);
for (i = 0; VEC_iterate (tree, aliases, i, alias); i++)
bitmap_set_bit (type_aliases, DECL_UID (alias));
- /* When grouping, we may have added PTR's type tag into the
+ /* When grouping, we may have added PTR's symbol 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, DECL_UID (tmt));
+ positive, pretend that SMT is in its own alias set. */
+ bitmap_set_bit (type_aliases, DECL_UID (smt));
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);
+ error ("alias set of a pointer's symbol tag should be a superset of the corresponding name tag");
+ debug_variable (smt);
debug_variable (pi->name_mem_tag);
goto err;
}
}
+/* Verify the consistency of call clobbering information. */
+static void
+verify_call_clobbering (void)
+{
+ unsigned int i;
+ bitmap_iterator bi;
+ tree var;
+ referenced_var_iterator rvi;
+
+ /* At all times, the result of the DECL_CALL_CLOBBERED flag should
+ match the result of the call_clobbered_vars bitmap. Verify both
+ that everything in call_clobbered_vars is marked
+ DECL_CALL_CLOBBERED, and that everything marked
+ DECL_CALL_CLOBBERED is in call_clobbered_vars. */
+ EXECUTE_IF_SET_IN_BITMAP (call_clobbered_vars, 0, i, bi)
+ {
+ var = referenced_var (i);
+ if (!MTAG_P (var) && !DECL_CALL_CLOBBERED (var))
+ {
+ error ("variable in call_clobbered_vars but not marked DECL_CALL_CLOBBERED");
+ debug_variable (var);
+ goto err;
+ }
+ }
+ FOR_EACH_REFERENCED_VAR (var, rvi)
+ {
+ if (!MTAG_P (var) && DECL_CALL_CLOBBERED (var)
+ && !bitmap_bit_p (call_clobbered_vars, DECL_UID (var)))
+ {
+ error ("variable marked DECL_CALL_CLOBBERED but not in call_clobbered_vars bitmap.");
+ debug_variable (var);
+ goto err;
+ }
+ }
+ return;
+
+ err:
+ internal_error ("verify_call_clobbering failed");
+}
+
/* Verify the consistency of aliasing information. */
static void
{
verify_flow_sensitive_alias_info ();
verify_name_tags ();
+ verify_call_clobbering ();
verify_flow_insensitive_alias_info ();
}
tree var = SSA_NAME_VAR (t);
tree def = SSA_NAME_DEF_STMT (t);
tree context = (tree) data;
- location_t * locus;
+ location_t *locus;
+ expanded_location xloc, floc;
/* Default uses (indicated by an empty definition statement),
are uninitialized. */
? EXPR_LOCUS (context)
: &DECL_SOURCE_LOCATION (var));
warning (0, gmsgid, locus, var);
+ xloc = expand_location (*locus);
+ floc = expand_location (DECL_SOURCE_LOCATION (cfun->decl));
+ if (xloc.file != floc.file
+ || xloc.line < floc.line
+ || xloc.line > LOCATION_LINE (cfun->function_end_locus))
+ inform ("%J%qD was declared here", var, var);
+
TREE_NO_WARNING (var) = 1;
}
}
}
-static void
+static unsigned int
execute_early_warn_uninitialized (void)
{
block_stmt_iterator bsi;
walk_tree (bsi_stmt_ptr (bsi), warn_uninitialized_var,
context, NULL);
}
+ return 0;
}
-static void
+static unsigned int
execute_late_warn_uninitialized (void)
{
basic_block bb;
FOR_EACH_BB (bb)
for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi))
warn_uninitialized_phi (phi);
+ return 0;
}
static bool
OSDN Git Service
