Obviously this isn't quite ready for trunk yet.
libcpp/ChangeLog:
* include/line-map.h (rich_location::maybe_add_fixit): Make
public.
* line-map.cc (linemap_add): Hack away assertion about LC_RENAME
for now.
Signed-off-by: David Malcolm <dmalc...@redhat.com>
---
libcpp/include/line-map.h | 7 ++++---
libcpp/line-map.cc | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h
index 80335721e03..c27d8a6fdcd 100644
--- a/libcpp/include/line-map.h
+++ b/libcpp/include/line-map.h
@@ -1799,13 +1799,14 @@ class rich_location
bool escape_on_output_p () const { return m_escape_on_output; }
void set_escape_on_output (bool flag) { m_escape_on_output = flag; }
-private:
- bool reject_impossible_fixit (location_t where);
- void stop_supporting_fixits ();
void maybe_add_fixit (location_t start,
location_t next_loc,
const char *new_content);
+private:
+ bool reject_impossible_fixit (location_t where);
+ void stop_supporting_fixits ();
+
public:
static const int STATICALLY_ALLOCATED_RANGES = 3;
diff --git a/libcpp/line-map.cc b/libcpp/line-map.cc
index 62077c3857c..82f27280ea7 100644
--- a/libcpp/line-map.cc
+++ b/libcpp/line-map.cc
@@ -496,10 +496,11 @@ linemap_add (line_maps *set, enum lc_reason reason,
linemap_assert (!LINEMAPS_ORDINARY_USED (set)
|| (start_location
>= MAP_START_LOCATION (LINEMAPS_LAST_ORDINARY_MAP
(set))));
-
+#if 0
/* When we enter the file for the first time reason cannot be
LC_RENAME. */
linemap_assert (!(set->depth == 0 && reason == LC_RENAME));
+#endif
/* If we are leaving the main file, return a NULL map. */
if (reason == LC_LEAVE
--
2.26.3
