Commit 181463c2 by David Malcolm Committed by David Malcolm

libcpp: remove redundant parameter from rich_location::set_range

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
parent 0d7f9065
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> 2018-07-20 Martin Sebor <msebor@redhat.com>
PR middle-end/82063 PR middle-end/82063
......
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> 2018-07-20 Martin Sebor <msebor@redhat.com>
PR middle-end/82063 PR middle-end/82063
......
...@@ -6133,7 +6133,7 @@ c_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason, ...@@ -6133,7 +6133,7 @@ c_cpp_error (cpp_reader *pfile ATTRIBUTE_UNUSED, int level, int reason,
gcc_unreachable (); gcc_unreachable ();
} }
if (done_lexing) 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, diagnostic_set_info_translated (&diagnostic, msg, ap,
richloc, dlevel); richloc, dlevel);
diagnostic_override_option_index (&diagnostic, diagnostic_override_option_index (&diagnostic,
...@@ -8174,7 +8174,7 @@ maybe_suggest_missing_token_insertion (rich_location *richloc, ...@@ -8174,7 +8174,7 @@ maybe_suggest_missing_token_insertion (rich_location *richloc,
location_t hint_loc = hint->get_start_loc (); location_t hint_loc = hint->get_start_loc ();
location_t old_loc = richloc->get_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); richloc->add_range (old_loc, false);
} }
} }
......
...@@ -699,7 +699,7 @@ void ...@@ -699,7 +699,7 @@ void
text_info::set_location (unsigned int idx, location_t loc, bool show_caret_p) text_info::set_location (unsigned int idx, location_t loc, bool show_caret_p)
{ {
gcc_checking_assert (m_richloc); 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 location_t
......
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> 2018-07-18 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR 69558 PR 69558
......
...@@ -1639,8 +1639,7 @@ class rich_location ...@@ -1639,8 +1639,7 @@ class rich_location
add_range (source_location loc, bool show_caret_p); add_range (source_location loc, bool show_caret_p);
void void
set_range (line_maps *set, unsigned int idx, source_location loc, set_range (unsigned int idx, source_location loc, bool show_caret_p);
bool show_caret_p);
unsigned int get_num_locations () const { return m_ranges.count (); } unsigned int get_num_locations () const { return m_ranges.count (); }
......
...@@ -2104,8 +2104,8 @@ rich_location::add_range (source_location loc, bool show_caret_p) ...@@ -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. */ - the "%C" and "%L" format codes in the Fortran frontend. */
void void
rich_location::set_range (line_maps * /*set*/, unsigned int idx, rich_location::set_range (unsigned int idx, source_location loc,
source_location loc, bool show_caret_p) bool show_caret_p)
{ {
/* We can either overwrite an existing range, or add one exactly /* We can either overwrite an existing range, or add one exactly
on the end of the array. */ on the end of the array. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment