diff options
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c/c-typeck.c | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 08fc250..85fe5e3 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2016-06-14 David Malcolm <dmalcolm@redhat.com> + + * c-typeck.c (build_component_ref): Simplify fixit code by + using gcc_rich_location::add_fixit_misspelled_id. + (set_init_label): Likewise. + 2016-06-13 David Malcolm <dmalcolm@redhat.com> * c-parser.c (c_parser_initelt): Provide location of name for new diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index ea04d5e..f987508 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -2371,14 +2371,9 @@ build_component_ref (location_t loc, tree datum, tree component, we have a valid range for the component. */ location_t reported_loc = (component_loc != UNKNOWN_LOCATION) ? component_loc : loc; - rich_location rich_loc (line_table, reported_loc); + gcc_rich_location rich_loc (reported_loc); if (component_loc != UNKNOWN_LOCATION) - { - source_range component_range = - get_range_from_loc (line_table, component_loc); - rich_loc.add_fixit_replace (component_range, - IDENTIFIER_POINTER (guessed_id)); - } + rich_loc.add_fixit_misspelled_id (component_loc, guessed_id); error_at_rich_loc (&rich_loc, "%qT has no member named %qE; did you mean %qE?", @@ -8234,11 +8229,8 @@ set_init_label (location_t loc, tree fieldname, location_t fieldname_loc, tree guessed_id = lookup_field_fuzzy (constructor_type, fieldname); if (guessed_id) { - rich_location rich_loc (line_table, fieldname_loc); - source_range component_range = - get_range_from_loc (line_table, fieldname_loc); - rich_loc.add_fixit_replace (component_range, - IDENTIFIER_POINTER (guessed_id)); + gcc_rich_location rich_loc (fieldname_loc); + rich_loc.add_fixit_misspelled_id (fieldname_loc, guessed_id); error_at_rich_loc (&rich_loc, "%qT has no member named %qE; did you mean %qE?", |