[committed] libcpp: remove redundant parameter from rich_location::set_range
David Malcolm
dmalcolm@redhat.com
Fri Jul 20 21:40:00 GMT 2018
Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu.
Committed to trunk as r262913.
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.
---
gcc/c-family/c-common.c | 4 ++--
gcc/pretty-print.c | 2 +-
libcpp/include/line-map.h | 3 +--
libcpp/line-map.c | 4 ++--
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index f5e1111..422d668 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -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);
}
}
diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c
index df3ee81..dc7791a 100644
--- a/gcc/pretty-print.c
+++ b/gcc/pretty-print.c
@@ -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
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index ba1750d..a4baa49 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -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 (); }
diff --git a/libcpp/line-map.c b/libcpp/line-map.c
index 1051022..a1a765f 100644
--- a/libcpp/line-map.c
+++ b/libcpp/line-map.c
@@ -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. */
--
1.8.5.3
More information about the Gcc-patches
mailing list