diff options
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/c/c-decl.c | 10 | ||||
| -rw-r--r-- | gcc/c/c-tree.h | 12 | ||||
| -rw-r--r-- | gcc/c/c-typeck.c | 6 | ||||
| -rw-r--r-- | gcc/c/gimple-parser.c | 2 |
5 files changed, 22 insertions, 15 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index df041a7..6620bd0 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,10 @@ +2018-11-13 David Malcolm <dmalcolm@redhat.com> + + * c-decl.c: Replace "source_location" with "location_t". + * c-tree.h: Likewise. + * c-typeck.c: Likewise. + * gimple-parser.c: Likewise. + 2018-11-09 Jakub Jelinek <jakub@redhat.com> * c-parser.c (c_parser_omp_clause_final): Use diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 8de5ffc..4a62b1e 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -9955,7 +9955,7 @@ build_null_declspecs (void) SPECS, returning SPECS. */ struct c_declspecs * -declspecs_add_addrspace (source_location location, +declspecs_add_addrspace (location_t location, struct c_declspecs *specs, addr_space_t as) { specs->non_sc_seen_p = true; @@ -9978,7 +9978,7 @@ declspecs_add_addrspace (source_location location, returning SPECS. */ struct c_declspecs * -declspecs_add_qual (source_location loc, +declspecs_add_qual (location_t loc, struct c_declspecs *specs, tree qual) { enum rid i; @@ -10895,7 +10895,7 @@ declspecs_add_type (location_t loc, struct c_declspecs *specs, declaration specifiers SPECS, returning SPECS. */ struct c_declspecs * -declspecs_add_scspec (source_location loc, +declspecs_add_scspec (location_t loc, struct c_declspecs *specs, tree scspec) { @@ -11014,7 +11014,7 @@ declspecs_add_scspec (source_location loc, returning SPECS. */ struct c_declspecs * -declspecs_add_attrs (source_location loc, struct c_declspecs *specs, tree attrs) +declspecs_add_attrs (location_t loc, struct c_declspecs *specs, tree attrs) { specs->attrs = chainon (attrs, specs->attrs); specs->locations[cdw_attributes] = loc; @@ -11026,7 +11026,7 @@ declspecs_add_attrs (source_location loc, struct c_declspecs *specs, tree attrs) alignment is ALIGN) to the declaration specifiers SPECS, returning SPECS. */ struct c_declspecs * -declspecs_add_alignas (source_location loc, +declspecs_add_alignas (location_t loc, struct c_declspecs *specs, tree align) { int align_log; diff --git a/gcc/c/c-tree.h b/gcc/c/c-tree.h index be63fee..5ed2f48 100644 --- a/gcc/c/c-tree.h +++ b/gcc/c/c-tree.h @@ -288,7 +288,7 @@ enum c_declspec_word { specifier is added, please update the enum c_declspec_word above accordingly. */ struct c_declspecs { - source_location locations[cdw_number_of_elements]; + location_t locations[cdw_number_of_elements]; /* The type specified, if a single type specifier such as a struct, union or enum specifier, typedef name or typeof specifies the whole type, or NULL_TREE if none or a keyword such as "void" or @@ -592,19 +592,19 @@ extern struct c_declarator *build_id_declarator (tree); extern struct c_declarator *make_pointer_declarator (struct c_declspecs *, struct c_declarator *); extern struct c_declspecs *build_null_declspecs (void); -extern struct c_declspecs *declspecs_add_qual (source_location, +extern struct c_declspecs *declspecs_add_qual (location_t, struct c_declspecs *, tree); extern struct c_declspecs *declspecs_add_type (location_t, struct c_declspecs *, struct c_typespec); -extern struct c_declspecs *declspecs_add_scspec (source_location, +extern struct c_declspecs *declspecs_add_scspec (location_t, struct c_declspecs *, tree); -extern struct c_declspecs *declspecs_add_attrs (source_location, +extern struct c_declspecs *declspecs_add_attrs (location_t, struct c_declspecs *, tree); -extern struct c_declspecs *declspecs_add_addrspace (source_location, +extern struct c_declspecs *declspecs_add_addrspace (location_t, struct c_declspecs *, addr_space_t); -extern struct c_declspecs *declspecs_add_alignas (source_location, +extern struct c_declspecs *declspecs_add_alignas (location_t, struct c_declspecs *, tree); extern struct c_declspecs *finish_declspecs (struct c_declspecs *); diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 144977e..5d4e973 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -6226,7 +6226,7 @@ pedwarn_init (location_t loc, int opt, const char *gmsgid, ...) /* Use the location where a macro was expanded rather than where it was defined to make sure macros defined in system headers but used incorrectly elsewhere are diagnosed. */ - source_location exploc = expansion_point_location_if_in_system_header (loc); + location_t exploc = expansion_point_location_if_in_system_header (loc); auto_diagnostic_group d; va_list ap; va_start (ap, gmsgid); @@ -6254,7 +6254,7 @@ warning_init (location_t loc, int opt, const char *gmsgid) /* Use the location where a macro was expanded rather than where it was defined to make sure macros defined in system headers but used incorrectly elsewhere are diagnosed. */ - source_location exploc = expansion_point_location_if_in_system_header (loc); + location_t exploc = expansion_point_location_if_in_system_header (loc); /* The gmsgid may be a format string with %< and %>. */ warned = warning_at (exploc, opt, gmsgid); @@ -10234,7 +10234,7 @@ c_finish_return (location_t loc, tree retval, tree origtype) /* Use the expansion point to handle cases such as returning NULL in a function returning void. */ - source_location xloc = expansion_point_location_if_in_system_header (loc); + location_t xloc = expansion_point_location_if_in_system_header (loc); if (TREE_THIS_VOLATILE (current_function_decl)) warning_at (xloc, 0, diff --git a/gcc/c/gimple-parser.c b/gcc/c/gimple-parser.c index ee2146f..c80a8bb 100644 --- a/gcc/c/gimple-parser.c +++ b/gcc/c/gimple-parser.c @@ -1643,7 +1643,7 @@ c_finish_gimple_return (location_t loc, tree retval) /* Use the expansion point to handle cases such as returning NULL in a function returning void. */ - source_location xloc = expansion_point_location_if_in_system_header (loc); + location_t xloc = expansion_point_location_if_in_system_header (loc); if (TREE_THIS_VOLATILE (current_function_decl)) warning_at (xloc, 0, |