aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog14
-rw-r--r--gcc/c/ChangeLog11
-rw-r--r--gcc/c/c-decl.c8
-rw-r--r--gcc/c/c-parser.c10
-rw-r--r--gcc/c/c-typeck.c2
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/name-lookup.c2
-rw-r--r--gcc/cp/parser.c2
-rw-r--r--gcc/diagnostic-show-locus.c17
-rw-r--r--gcc/gcc-rich-location.c17
-rw-r--r--gcc/gcc-rich-location.h2
11 files changed, 48 insertions, 43 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4dbc7b8..040c6c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2016-08-30 David Malcolm <dmalcolm@redhat.com>
+
+ * diagnostic-show-locus.c (test_one_liner_fixit_insert): Remove
+ redundant location param.
+ (test_one_liner_fixit_remove): Likewise.
+ (test_one_liner_fixit_replace): Likewise.
+ (test_one_liner_fixit_replace_equal_secondary_range): Likewise.
+ * gcc-rich-location.c
+ (gcc_rich_location::add_fixit_misspelled_id): Eliminate call to
+ get_range_from_loc. Drop overload taking a const char *.
+ * gcc-rich-location.h
+ (gcc_rich_location::add_fixit_misspelled_id): Drop overload taking
+ a const char *.
+
2016-08-30 Szabolcs Nagy <szabolcs.nagy@arm.com>
* config/linux.c (linux_libc_has_function): Return true on musl.
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 774e580..2d99155 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,14 @@
+2016-08-30 David Malcolm <dmalcolm@redhat.com>
+
+ * c-decl.c (implicit_decl_warning): Use add_fixit_replace
+ rather than add_fixit_misspelled_id.
+ (undeclared_variable): Likewise.
+ * c-parser.c (c_parser_declaration_or_fndef): Likewise. Remove
+ now-redundant "here" params from add_fixit_insert method calls.
+ (c_parser_parameter_declaration): Likewise.
+ * c-typeck.c (build_component_ref): Remove now-redundant range
+ param from add_fixit_replace method calls.
+
2016-08-25 Marek Polacek <polacek@redhat.com>
* c-typeck.c (parser_build_binary_op): Pass LHS to
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 0c52a64..8f49c35 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -3096,7 +3096,7 @@ implicit_decl_warning (location_t loc, tree id, tree olddecl)
if (hint)
{
gcc_rich_location richloc (loc);
- richloc.add_fixit_misspelled_id (loc, hint);
+ richloc.add_fixit_replace (hint);
warned = pedwarn_at_rich_loc
(&richloc, OPT_Wimplicit_function_declaration,
"implicit declaration of function %qE; did you mean %qs?",
@@ -3109,7 +3109,7 @@ implicit_decl_warning (location_t loc, tree id, tree olddecl)
if (hint)
{
gcc_rich_location richloc (loc);
- richloc.add_fixit_misspelled_id (loc, hint);
+ richloc.add_fixit_replace (hint);
warned = warning_at_rich_loc
(&richloc, OPT_Wimplicit_function_declaration,
G_("implicit declaration of function %qE;did you mean %qs?"),
@@ -3437,7 +3437,7 @@ undeclared_variable (location_t loc, tree id)
if (guessed_id)
{
gcc_rich_location richloc (loc);
- richloc.add_fixit_misspelled_id (loc, guessed_id);
+ richloc.add_fixit_replace (guessed_id);
error_at_rich_loc (&richloc,
"%qE undeclared here (not in a function);"
" did you mean %qs?",
@@ -3455,7 +3455,7 @@ undeclared_variable (location_t loc, tree id)
if (guessed_id)
{
gcc_rich_location richloc (loc);
- richloc.add_fixit_misspelled_id (loc, guessed_id);
+ richloc.add_fixit_replace (guessed_id);
error_at_rich_loc
(&richloc,
"%qE undeclared (first use in this function);"
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index fe0c95f..c245e70 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -1685,7 +1685,7 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
if (tag_exists_p (RECORD_TYPE, name))
{
/* This is not C++ with its implicit typedef. */
- richloc.add_fixit_insert (here, "struct");
+ richloc.add_fixit_insert ("struct");
error_at_rich_loc (&richloc,
"unknown type name %qE;"
" use %<struct%> keyword to refer to the type",
@@ -1693,7 +1693,7 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
}
else if (tag_exists_p (UNION_TYPE, name))
{
- richloc.add_fixit_insert (here, "union");
+ richloc.add_fixit_insert ("union");
error_at_rich_loc (&richloc,
"unknown type name %qE;"
" use %<union%> keyword to refer to the type",
@@ -1701,7 +1701,7 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
}
else if (tag_exists_p (ENUMERAL_TYPE, name))
{
- richloc.add_fixit_insert (here, "enum");
+ richloc.add_fixit_insert ("enum");
error_at_rich_loc (&richloc,
"unknown type name %qE;"
" use %<enum%> keyword to refer to the type",
@@ -1712,7 +1712,7 @@ c_parser_declaration_or_fndef (c_parser *parser, bool fndef_ok,
const char *hint = lookup_name_fuzzy (name, FUZZY_LOOKUP_TYPENAME);
if (hint)
{
- richloc.add_fixit_misspelled_id (here, hint);
+ richloc.add_fixit_replace (hint);
error_at_rich_loc (&richloc,
"unknown type name %qE; did you mean %qs?",
name, hint);
@@ -3864,7 +3864,7 @@ c_parser_parameter_declaration (c_parser *parser, tree attrs)
if (hint)
{
gcc_rich_location richloc (token->location);
- richloc.add_fixit_misspelled_id (token->location, hint);
+ richloc.add_fixit_replace (hint);
error_at_rich_loc (&richloc,
"unknown type name %qE; did you mean %qs?",
token->value, hint);
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index 2f8d611..5194027 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -2474,7 +2474,7 @@ build_component_ref (location_t loc, tree datum, tree component,
where the user has confused "." vs "->". */
rich_location richloc (line_table, loc);
/* "loc" should be the "." token. */
- richloc.add_fixit_replace (source_range::from_location (loc), "->");
+ richloc.add_fixit_replace ("->");
error_at_rich_loc (&richloc,
"%qE is a pointer; did you mean to use %<->%>?",
datum);
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 55651bc..7ae6f53 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-30 David Malcolm <dmalcolm@redhat.com>
+
+ * name-lookup.c (suggest_alternatives_for): Use add_fixit_replace
+ rather than add_fixit_misspelled_id.
+ * parser.c (cp_parser_diagnose_invalid_type_name): Likewise.
+
2016-08-29 Jason Merrill <jason@redhat.com>
PR c++/77379
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index f6ba4d2..022ab6a 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -4446,7 +4446,7 @@ suggest_alternatives_for (location_t location, tree name)
if (fuzzy_name)
{
gcc_rich_location richloc (location);
- richloc.add_fixit_misspelled_id (location, fuzzy_name);
+ richloc.add_fixit_replace (fuzzy_name);
inform_at_rich_loc (&richloc, "suggested alternative: %qs",
fuzzy_name);
}
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index d54cf8a..48dbca1 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3171,7 +3171,7 @@ cp_parser_diagnose_invalid_type_name (cp_parser *parser, tree id,
if (suggestion)
{
gcc_rich_location richloc (location);
- richloc.add_fixit_misspelled_id (location, suggestion);
+ richloc.add_fixit_replace (suggestion);
error_at_rich_loc (&richloc,
"%qE does not name a type; did you mean %qs?",
id, suggestion);
diff --git a/gcc/diagnostic-show-locus.c b/gcc/diagnostic-show-locus.c
index ba52f24..60f6820 100644
--- a/gcc/diagnostic-show-locus.c
+++ b/gcc/diagnostic-show-locus.c
@@ -1487,7 +1487,7 @@ test_one_liner_fixit_insert ()
test_diagnostic_context dc;
location_t caret = linemap_position_for_column (line_table, 7);
rich_location richloc (line_table, caret);
- richloc.add_fixit_insert (caret, "&");
+ richloc.add_fixit_insert ("&");
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
ASSERT_STREQ ("\n"
" foo = bar.field;\n"
@@ -1506,10 +1506,7 @@ test_one_liner_fixit_remove ()
location_t finish = linemap_position_for_column (line_table, 15);
location_t dot = make_location (start, start, finish);
rich_location richloc (line_table, dot);
- source_range range;
- range.m_start = start;
- range.m_finish = finish;
- richloc.add_fixit_remove (range);
+ richloc.add_fixit_remove ();
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
ASSERT_STREQ ("\n"
" foo = bar.field;\n"
@@ -1528,10 +1525,7 @@ test_one_liner_fixit_replace ()
location_t finish = linemap_position_for_column (line_table, 15);
location_t field = make_location (start, start, finish);
rich_location richloc (line_table, field);
- source_range range;
- range.m_start = start;
- range.m_finish = finish;
- richloc.add_fixit_replace (range, "m_field");
+ richloc.add_fixit_replace ("m_field");
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
ASSERT_STREQ ("\n"
" foo = bar.field;\n"
@@ -1580,10 +1574,7 @@ test_one_liner_fixit_replace_equal_secondary_range ()
rich_location richloc (line_table, equals);
location_t field = make_location (start, start, finish);
richloc.add_range (field, false);
- source_range range;
- range.m_start = start;
- range.m_finish = finish;
- richloc.add_fixit_replace (range, "m_field");
+ richloc.add_fixit_replace (field, "m_field");
diagnostic_show_locus (&dc, &richloc, DK_ERROR);
/* The replacement range is indicated in the annotation line,
so it shouldn't be indicated via an additional underline. */
diff --git a/gcc/gcc-rich-location.c b/gcc/gcc-rich-location.c
index 09475ff..b8787b4 100644
--- a/gcc/gcc-rich-location.c
+++ b/gcc/gcc-rich-location.c
@@ -70,20 +70,5 @@ gcc_rich_location::add_fixit_misspelled_id (location_t misspelled_token_loc,
{
gcc_assert (TREE_CODE (hint_id) == IDENTIFIER_NODE);
- source_range misspelled_token_range
- = get_range_from_loc (line_table, misspelled_token_loc);
- add_fixit_replace (misspelled_token_range, IDENTIFIER_POINTER (hint_id));
-}
-
-/* As above, but with a const char * for the suggested replacement. */
-
-void
-gcc_rich_location::add_fixit_misspelled_id (location_t misspelled_token_loc,
- const char *hint)
-{
- gcc_assert (hint);
-
- source_range misspelled_token_range
- = get_range_from_loc (line_table, misspelled_token_loc);
- add_fixit_replace (misspelled_token_range, hint);
+ add_fixit_replace (misspelled_token_loc, IDENTIFIER_POINTER (hint_id));
}
diff --git a/gcc/gcc-rich-location.h b/gcc/gcc-rich-location.h
index cc5987f..0599904 100644
--- a/gcc/gcc-rich-location.h
+++ b/gcc/gcc-rich-location.h
@@ -40,8 +40,6 @@ class gcc_rich_location : public rich_location
void add_fixit_misspelled_id (location_t misspelled_token_loc,
tree hint_id);
- void add_fixit_misspelled_id (location_t misspelled_token_loc,
- const char *hint);
};
#endif /* GCC_RICH_LOCATION_H */
generated by cgit v1.1 at 2025-05-31 20:42:48 +0000