From 620e594be58d2f933902a6619fd20aa618070b4b Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 13 Nov 2018 20:05:03 +0000 Subject: Eliminate source_location in favor of location_t Historically GCC used location_t, while libcpp used source_location. This inconsistency has been annoying me for a while, so this patch removes source_location in favor of location_t throughout (as the latter is shorter). gcc/ChangeLog: * builtins.c: Replace "source_location" with "location_t". * diagnostic-show-locus.c: Likewise. * diagnostic.c: Likewise. * dumpfile.c: Likewise. * gcc-rich-location.h: Likewise. * genmatch.c: Likewise. * gimple.h: Likewise. * gimplify.c: Likewise. * input.c: Likewise. * input.h: Likewise. Eliminate the typedef. * omp-expand.c: Likewise. * selftest.h: Likewise. * substring-locations.h (get_source_location_for_substring): Rename to.. (get_location_within_string): ...this. * tree-cfg.c: Replace "source_location" with "location_t". * tree-cfgcleanup.c: Likewise. * tree-diagnostic.c: Likewise. * tree-into-ssa.c: Likewise. * tree-outof-ssa.c: Likewise. * tree-parloops.c: Likewise. * tree-phinodes.c: Likewise. * tree-phinodes.h: Likewise. * tree-ssa-loop-ivopts.c: Likewise. * tree-ssa-loop-manip.c: Likewise. * tree-ssa-phiopt.c: Likewise. * tree-ssa-phiprop.c: Likewise. * tree-ssa-threadupdate.c: Likewise. * tree-ssa.c: Likewise. * tree-ssa.h: Likewise. * tree-vect-loop-manip.c: Likewise. gcc/c-family/ChangeLog: * c-common.c (c_get_substring_location): Update for renaming of get_source_location_for_substring to get_location_within_string. * c-lex.c: Replace "source_location" with "location_t". * c-opts.c: Likewise. * c-ppoutput.c: Likewise. gcc/c/ChangeLog: * c-decl.c: Replace "source_location" with "location_t". * c-tree.h: Likewise. * c-typeck.c: Likewise. * gimple-parser.c: Likewise. gcc/cp/ChangeLog: * call.c: Replace "source_location" with "location_t". * cp-tree.h: Likewise. * cvt.c: Likewise. * name-lookup.c: Likewise. * parser.c: Likewise. * typeck.c: Likewise. gcc/fortran/ChangeLog: * cpp.c: Replace "source_location" with "location_t". * gfortran.h: Likewise. gcc/go/ChangeLog: * go-gcc-diagnostics.cc: Replace "source_location" with "location_t". * go-gcc.cc: Likewise. * go-linemap.cc: Likewise. * go-location.h: Likewise. * gofrontend/README: Likewise. gcc/jit/ChangeLog: * jit-playback.c: Replace "source_location" with "location_t". gcc/testsuite/ChangeLog: * g++.dg/plugin/comment_plugin.c: Replace "source_location" with "location_t". * gcc.dg/plugin/diagnostic_plugin_test_show_locus.c: Likewise. libcc1/ChangeLog: * libcc1plugin.cc: Replace "source_location" with "location_t". (plugin_context::get_source_location): Rename to... (plugin_context::get_location_t): ...this. * libcp1plugin.cc: Likewise. libcpp/ChangeLog: * charset.c: Replace "source_location" with "location_t". * directives-only.c: Likewise. * directives.c: Likewise. * errors.c: Likewise. * expr.c: Likewise. * files.c: Likewise. * include/cpplib.h: Likewise. Rename MAX_SOURCE_LOCATION to MAX_LOCATION_T. * include/line-map.h: Likewise. * init.c: Likewise. * internal.h: Likewise. * lex.c: Likewise. * line-map.c: Likewise. * location-example.txt: Likewise. * macro.c: Likewise. * pch.c: Likewise. * traditional.c: Likewise. From-SVN: r266085 --- libcc1/ChangeLog | 7 +++++++ libcc1/libcc1plugin.cc | 12 ++++++------ libcc1/libcp1plugin.cc | 32 ++++++++++++++++---------------- 3 files changed, 29 insertions(+), 22 deletions(-) (limited to 'libcc1') diff --git a/libcc1/ChangeLog b/libcc1/ChangeLog index c4c81ee..f48ba14 100644 --- a/libcc1/ChangeLog +++ b/libcc1/ChangeLog @@ -1,3 +1,10 @@ +2018-11-13 David Malcolm + + * libcc1plugin.cc: Replace "source_location" with "location_t". + (plugin_context::get_source_location): Rename to... + (plugin_context::get_location_t): ...this. + * libcp1plugin.cc: Likewise. + 2018-10-31 Joseph Myers PR bootstrap/82856 diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc index 164ed3b..f759c79 100644 --- a/libcc1/libcc1plugin.cc +++ b/libcc1/libcc1plugin.cc @@ -187,15 +187,15 @@ struct plugin_context : public cc1_plugin::connection return t; } - source_location get_source_location (const char *filename, - unsigned int line_number) + location_t get_location_t (const char *filename, + unsigned int line_number) { if (filename == NULL) return UNKNOWN_LOCATION; filename = intern_filename (filename); linemap_add (line_table, LC_ENTER, false, filename, line_number); - source_location loc = linemap_line_start (line_table, line_number, 0); + location_t loc = linemap_line_start (line_table, line_number, 0); linemap_add (line_table, LC_LEAVE, false, NULL, 0); return loc; } @@ -397,7 +397,7 @@ plugin_build_decl (cc1_plugin::connection *self, abort (); } - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); decl = build_decl (loc, code, identifier, sym_type); TREE_USED (decl) = 1; @@ -448,7 +448,7 @@ plugin_tagbind (cc1_plugin::connection *self, { plugin_context *ctx = static_cast (self); tree t = convert_in (tagged_type), x; - c_pushtag (ctx->get_source_location (filename, line_number), + c_pushtag (ctx->get_location_t (filename, line_number), get_identifier (name), t); /* Propagate the newly-added type name so that previously-created @@ -884,7 +884,7 @@ plugin_build_constant (cc1_plugin::connection *self, gcc_type type_in, tree type = convert_in (type_in); cst = build_int_cst (type, value); - decl = build_decl (ctx->get_source_location (filename, line_number), + decl = build_decl (ctx->get_location_t (filename, line_number), CONST_DECL, get_identifier (name), type); DECL_INITIAL (decl) = cst; pushdecl_safe (decl); diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc index 1034147..f8ed90b 100644 --- a/libcc1/libcp1plugin.cc +++ b/libcc1/libcp1plugin.cc @@ -178,15 +178,15 @@ struct plugin_context : public cc1_plugin::connection return t; } - source_location get_source_location (const char *filename, - unsigned int line_number) + location_t get_location_t (const char *filename, + unsigned int line_number) { if (filename == NULL) return UNKNOWN_LOCATION; filename = intern_filename (filename); linemap_add (line_table, LC_ENTER, false, filename, line_number); - source_location loc = linemap_line_start (line_table, line_number, 0); + location_t loc = linemap_line_start (line_table, line_number, 0); linemap_add (line_table, LC_LEAVE, false, NULL, 0); return loc; } @@ -1028,7 +1028,7 @@ plugin_add_using_decl (cc1_plugin::connection *, static tree build_named_class_type (enum tree_code code, tree id, - source_location loc) + location_t loc) { /* See at_fake_function_scope_p. */ gcc_assert (!at_function_scope_p ()); @@ -1114,7 +1114,7 @@ plugin_build_decl (cc1_plugin::connection *self, gcc_assert (!substitution_name); } - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); bool class_member_p = at_class_scope_p (); bool ctor = false, dtor = false, assop = false; tree_code opcode = ERROR_MARK; @@ -1742,7 +1742,7 @@ plugin_start_class_type (cc1_plugin::connection *self, unsigned int line_number) { plugin_context *ctx = static_cast (self); - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); tree typedecl = convert_in (typedecl_in); tree type = TREE_TYPE (typedecl); @@ -1802,8 +1802,8 @@ plugin_start_closure_class_type (cc1_plugin::connection *self, tree lambda_expr = build_lambda_expr (); - LAMBDA_EXPR_LOCATION (lambda_expr) = ctx->get_source_location (filename, - line_number); + LAMBDA_EXPR_LOCATION (lambda_expr) = ctx->get_location_t (filename, + line_number); tree type = begin_lambda_type (lambda_expr); @@ -1936,7 +1936,7 @@ plugin_start_enum_type (cc1_plugin::connection *self, gcc_assert (is_new_type); - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); tree type_decl = TYPE_NAME (type); DECL_SOURCE_LOCATION (type_decl) = loc; SET_OPAQUE_ENUM_P (type, false); @@ -2244,7 +2244,7 @@ plugin_build_type_template_parameter (cc1_plugin::connection *self, unsigned int line_number) { plugin_context *ctx = static_cast (self); - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); gcc_assert (template_parm_scope_p ()); @@ -2274,7 +2274,7 @@ plugin_build_template_template_parameter (cc1_plugin::connection *self, unsigned int line_number) { plugin_context *ctx = static_cast (self); - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); gcc_assert (template_parm_scope_p ()); @@ -2309,7 +2309,7 @@ plugin_build_value_template_parameter (cc1_plugin::connection *self, unsigned int line_number) { plugin_context *ctx = static_cast (self); - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); gcc_assert (template_parm_scope_p ()); @@ -3354,7 +3354,7 @@ plugin_build_function_template_specialization (cc1_plugin::connection *self, unsigned int line_number) { plugin_context *ctx = static_cast (self); - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); tree name = convert_in (template_decl); tree targsl = targlist (targs); @@ -3374,7 +3374,7 @@ plugin_build_class_template_specialization (cc1_plugin::connection *self, unsigned int line_number) { plugin_context *ctx = static_cast (self); - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); tree name = convert_in (template_decl); tree tdecl = finish_template_type (name, targlist (args), false);; @@ -3601,7 +3601,7 @@ plugin_build_constant (cc1_plugin::connection *self, gcc_type type_in, cst = build_int_cst (type, value); if (!TYPE_READONLY (type)) type = build_qualified_type (type, TYPE_QUAL_CONST); - decl = build_decl (ctx->get_source_location (filename, line_number), + decl = build_decl (ctx->get_location_t (filename, line_number), VAR_DECL, get_identifier (name), type); TREE_STATIC (decl) = 1; TREE_READONLY (decl) = 1; @@ -3637,7 +3637,7 @@ plugin_add_static_assert (cc1_plugin::connection *self, TREE_TYPE (message) = char_array_type_node; fix_string_type (message); - source_location loc = ctx->get_source_location (filename, line_number); + location_t loc = ctx->get_location_t (filename, line_number); bool member_p = at_class_scope_p (); -- cgit v1.1