Commit df0fc585 by Jason Merrill Committed by Jason Merrill

* tree.c (warn_deprecated_use): Return bool. Simplify logic.

From-SVN: r260290
parent 68435eb2
2018-05-16 Jason Merrill <jason@redhat.com>
* tree.c (warn_deprecated_use): Return bool. Simplify logic.
2018-05-16 Richard Biener <rguenther@suse.de> 2018-05-16 Richard Biener <rguenther@suse.de>
* tree-vectorizer.h (struct stmt_info_for_cost): Add where member. * tree-vectorizer.h (struct stmt_info_for_cost): Add where member.
......
...@@ -12420,14 +12420,16 @@ typedef_variant_p (const_tree type) ...@@ -12420,14 +12420,16 @@ typedef_variant_p (const_tree type)
return is_typedef_decl (TYPE_NAME (type)); return is_typedef_decl (TYPE_NAME (type));
} }
/* Warn about a use of an identifier which was marked deprecated. */ /* Warn about a use of an identifier which was marked deprecated. Returns
void whether a warning was given. */
bool
warn_deprecated_use (tree node, tree attr) warn_deprecated_use (tree node, tree attr)
{ {
const char *msg; const char *msg;
if (node == 0 || !warn_deprecated_decl) if (node == 0 || !warn_deprecated_decl)
return; return false;
if (!attr) if (!attr)
{ {
...@@ -12450,7 +12452,7 @@ warn_deprecated_use (tree node, tree attr) ...@@ -12450,7 +12452,7 @@ warn_deprecated_use (tree node, tree attr)
else else
msg = NULL; msg = NULL;
bool w; bool w = false;
if (DECL_P (node)) if (DECL_P (node))
{ {
if (msg) if (msg)
...@@ -12476,8 +12478,6 @@ warn_deprecated_use (tree node, tree attr) ...@@ -12476,8 +12478,6 @@ warn_deprecated_use (tree node, tree attr)
what = DECL_NAME (TYPE_NAME (node)); what = DECL_NAME (TYPE_NAME (node));
} }
if (decl)
{
if (what) if (what)
{ {
if (msg) if (msg)
...@@ -12496,29 +12496,11 @@ warn_deprecated_use (tree node, tree attr) ...@@ -12496,29 +12496,11 @@ warn_deprecated_use (tree node, tree attr)
w = warning (OPT_Wdeprecated_declarations, w = warning (OPT_Wdeprecated_declarations,
"type is deprecated"); "type is deprecated");
} }
if (w) if (w && decl)
inform (DECL_SOURCE_LOCATION (decl), "declared here"); inform (DECL_SOURCE_LOCATION (decl), "declared here");
} }
else
{ return w;
if (what)
{
if (msg)
warning (OPT_Wdeprecated_declarations, "%qE is deprecated: %s",
what, msg);
else
warning (OPT_Wdeprecated_declarations, "%qE is deprecated", what);
}
else
{
if (msg)
warning (OPT_Wdeprecated_declarations, "type is deprecated: %s",
msg);
else
warning (OPT_Wdeprecated_declarations, "type is deprecated");
}
}
}
} }
/* Return true if REF has a COMPONENT_REF with a bit-field field declaration /* Return true if REF has a COMPONENT_REF with a bit-field field declaration
......
...@@ -4828,7 +4828,7 @@ extern tree tree_strip_sign_nop_conversions (tree); ...@@ -4828,7 +4828,7 @@ extern tree tree_strip_sign_nop_conversions (tree);
extern const_tree strip_invariant_refs (const_tree); extern const_tree strip_invariant_refs (const_tree);
extern tree lhd_gcc_personality (void); extern tree lhd_gcc_personality (void);
extern void assign_assembler_name_if_needed (tree); extern void assign_assembler_name_if_needed (tree);
extern void warn_deprecated_use (tree, tree); extern bool warn_deprecated_use (tree, tree);
extern void cache_integer_cst (tree); extern void cache_integer_cst (tree);
extern const char *combined_fn_name (combined_fn); extern const char *combined_fn_name (combined_fn);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment