procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libcpp: remove redundant parameter from rich_location::set_range

Browse source 
gcc/c-family/ChangeLog:
	* c-common.c (c_cpp_error): Remove redundant "line_table"
	parameter from call to rich_location::set_range.
	(maybe_suggest_missing_token_insertion): Likewise.

gcc/ChangeLog:
	* pretty-print.c (text_info::set_location): Remove redundant
	"line_table" parameter from call to rich_location::set_range.

libcpp/ChangeLog:
	* include/line-map.h (rich_location::set_range): Remove redundant
	line_maps * parameter.
	* line-map.c (rich_location::set_range): Likewise.

From-SVN: r262913
This commit is contained in:
David Malcolm 2018-07-20 21:39:14 +00:00 • committed by David Malcolm
parent 0d7f906520
commit 181463c271
7 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/ChangeLog
View file

@ -1,3 +1,8 @@
2018-07-20 David Malcolm <dmalcolm@redhat.com>
* pretty-print.c (text_info::set_location): Remove redundant
"line_table" parameter from call to rich_location::set_range.
2018-07-20 Martin Sebor <msebor@redhat.com>
PR middle-end/82063

6
gcc/c-family/ChangeLog
View file

@ -1,3 +1,9 @@
2018-07-20 David Malcolm <dmalcolm@redhat.com>
* c-common.c (c_cpp_error): Remove redundant "line_table"
parameter from call to rich_location::set_range.
(maybe_suggest_missing_token_insertion): Likewise.
2018-07-20 Martin Sebor <msebor@redhat.com>
PR middle-end/82063

4
gcc/c-family/c-common.c
View file

@ -6133,7 +6133,7 @@ c_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason,
gcc_unreachable ();
}
if (done_lexing)
richloc->set_range (line_table, 0, input_location, true);
richloc->set_range (0, input_location, true);
diagnostic_set_info_translated (&diagnostic, msg, ap,
richloc, dlevel);
diagnostic_override_option_index (&diagnostic,
@ -8174,7 +8174,7 @@ maybe_suggest_missing_token_insertion (rich_location *richloc,
location_t hint_loc = hint->get_start_loc ();
location_t old_loc = richloc->get_loc ();
richloc->set_range (line_table, 0, hint_loc, true);
richloc->set_range (0, hint_loc, true);
richloc->add_range (old_loc, false);
}
}

2
gcc/pretty-print.c
View file

@ -699,7 +699,7 @@ void
text_info::set_location (unsigned int idx, location_t loc, bool show_caret_p)
{
gcc_checking_assert (m_richloc);
m_richloc->set_range (line_table, idx, loc, show_caret_p);
m_richloc->set_range (idx, loc, show_caret_p);
}
location_t

6
libcpp/ChangeLog
View file

@ -1,3 +1,9 @@
2018-07-20 David Malcolm <dmalcolm@redhat.com>
* include/line-map.h (rich_location::set_range): Remove redundant
line_maps * parameter.
* line-map.c (rich_location::set_range): Likewise.
2018-07-18 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR 69558

3
libcpp/include/line-map.h
View file

@ -1639,8 +1639,7 @@ class rich_location
add_range (source_location loc, bool show_caret_p);
void
set_range (line_maps *set, unsigned int idx, source_location loc,
bool show_caret_p);
set_range (unsigned int idx, source_location loc, bool show_caret_p);
unsigned int get_num_locations () const { return m_ranges.count (); }

4
libcpp/line-map.c
View file

@ -2104,8 +2104,8 @@ rich_location::add_range (source_location loc, bool show_caret_p)
- the "%C" and "%L" format codes in the Fortran frontend. */
void
rich_location::set_range (line_maps * /*set*/, unsigned int idx,
source_location loc, bool show_caret_p)
rich_location::set_range (unsigned int idx, source_location loc,
bool show_caret_p)
{
/* We can either overwrite an existing range, or add one exactly
on the end of the array. */