On Sun, Nov 17, 2024 at 4:29 AM Lewis Hyatt <[email protected]> wrote:
>
> The C/C++ frontend code contains a couple instances where a callback
> receiving a "location_t" argument is prototyped to take "unsigned int"
> instead. This will make a difference once location_t can be configured to a
> different type, so adjust that now.
>
> Also remove a comment about -flarge-source-files, which will be removed
> shortly.
OK.
Thanks,
Richard.
> gcc/c-family/ChangeLog:
>
> * c-indentation.cc (should_warn_for_misleading_indentation): Remove
> comment about -flarge-source-files.
> * c-lex.cc (cb_ident): Change "unsigned int" argument to type
> "location_t".
> (cb_def_pragma): Likewise.
> (cb_define): Likewise.
> (cb_undef): Likewise.
> ---
> gcc/c-family/c-indentation.cc | 5 -----
> gcc/c-family/c-lex.cc | 10 +++++-----
> 2 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/gcc/c-family/c-indentation.cc b/gcc/c-family/c-indentation.cc
> index 3bd85e53c59..7a70d608eec 100644
> --- a/gcc/c-family/c-indentation.cc
> +++ b/gcc/c-family/c-indentation.cc
> @@ -322,11 +322,6 @@ should_warn_for_misleading_indentation (const
> token_indent_info &guard_tinfo,
> "%<-Wmisleading-indentation%> is disabled from this point"
> " onwards, since column-tracking was disabled due to"
> " the size of the code/headers");
> - if (!flag_large_source_files)
> - inform (guard_loc,
> - "adding %<-flarge-source-files%> will allow for more"
> - " column-tracking support, at the expense of compilation"
> - " time and memory");
> }
> return false;
> }
> diff --git a/gcc/c-family/c-lex.cc b/gcc/c-family/c-lex.cc
> index 32f19702c79..90ae4caa225 100644
> --- a/gcc/c-family/c-lex.cc
> +++ b/gcc/c-family/c-lex.cc
> @@ -54,10 +54,10 @@ static tree lex_charconst (const cpp_token *);
> static void update_header_times (const char *);
> static int dump_one_header (splay_tree_node, void *);
> static void cb_line_change (cpp_reader *, const cpp_token *, int);
> -static void cb_ident (cpp_reader *, unsigned int, const cpp_string *);
> -static void cb_def_pragma (cpp_reader *, unsigned int);
> -static void cb_define (cpp_reader *, unsigned int, cpp_hashnode *);
> -static void cb_undef (cpp_reader *, unsigned int, cpp_hashnode *);
> +static void cb_ident (cpp_reader *, location_t, const cpp_string *);
> +static void cb_def_pragma (cpp_reader *, location_t);
> +static void cb_define (cpp_reader *, location_t, cpp_hashnode *);
> +static void cb_undef (cpp_reader *, location_t, cpp_hashnode *);
>
> void
> init_c_lex (void)
> @@ -164,7 +164,7 @@ dump_time_statistics (void)
>
> static void
> cb_ident (cpp_reader * ARG_UNUSED (pfile),
> - unsigned int ARG_UNUSED (line),
> + location_t ARG_UNUSED (line),
> const cpp_string * ARG_UNUSED (str))
> {
> if (!flag_no_ident)
