1 files changed, 154 insertions, 109 deletions

diff --git a/libcpp/line-map.cc b/libcpp/line-map.cc
index e0f82e20..cd17353 100644
--- a/libcpp/line-map.cc
+++ b/libcpp/line-map.cc
@@ -36,11 +36,11 @@ static location_t linemap_macro_map_loc_to_def_point
 static location_t linemap_macro_map_loc_to_exp_point
 (const line_map_macro *, location_t);
 static location_t linemap_macro_loc_to_spelling_point
-(line_maps *, location_t, const line_map_ordinary **);
-static location_t linemap_macro_loc_to_def_point (line_maps *,
+(const line_maps *, location_t, const line_map_ordinary **);
+static location_t linemap_macro_loc_to_def_point (const line_maps *,
 						  location_t,
 						  const line_map_ordinary **);
-static location_t linemap_macro_loc_to_exp_point (line_maps *,
+static location_t linemap_macro_loc_to_exp_point (const line_maps *,
 						  location_t,
 						  const line_map_ordinary **);
 
@@ -53,8 +53,8 @@ extern unsigned num_macro_tokens_counter;
 
 line_maps::~line_maps ()
 {
-  if (location_adhoc_data_map.htab)
-    htab_delete (location_adhoc_data_map.htab);
+  if (m_location_adhoc_data_map.htab)
+    htab_delete (m_location_adhoc_data_map.htab);
 }
 
 /* Hash function for location_adhoc_data hashtable.  */
@@ -109,14 +109,14 @@ location_adhoc_data_update (void **slot_v, void *param_v)
 void
 rebuild_location_adhoc_htab (line_maps *set)
 {
-  set->location_adhoc_data_map.htab =
+  set->m_location_adhoc_data_map.htab =
       htab_create (100, location_adhoc_data_hash, location_adhoc_data_eq, NULL);
-  for (auto p = set->location_adhoc_data_map.data,
-	    end = p + set->location_adhoc_data_map.curr_loc;
+  for (auto p = set->m_location_adhoc_data_map.data,
+	    end = p + set->m_location_adhoc_data_map.curr_loc;
       p != end; ++p)
     {
       const auto slot = reinterpret_cast<location_adhoc_data **>
-	(htab_find_slot (set->location_adhoc_data_map.htab, p, INSERT));
+	(htab_find_slot (set->m_location_adhoc_data_map.htab, p, INSERT));
       *slot = p;
     }
 }
@@ -125,12 +125,11 @@ rebuild_location_adhoc_htab (line_maps *set)
    Can the given LOCUS + SRC_RANGE and DATA pointer be stored compactly
    within a location_t, without needing to use an ad-hoc location.  */
 
-static bool
-can_be_stored_compactly_p (line_maps *set,
-			   location_t locus,
-			   source_range src_range,
-			   void *data,
-			   unsigned discriminator)
+bool
+line_maps::can_be_stored_compactly_p (location_t locus,
+				      source_range src_range,
+				      void *data,
+				      unsigned discriminator) const
 {
   /* If there's an ad-hoc pointer, we can't store it directly in the
      location_t, we need the lookaside.  */
@@ -156,7 +155,7 @@ can_be_stored_compactly_p (line_maps *set,
 
   /* All 3 locations must be within ordinary maps, typically, the same
      ordinary map.  */
-  location_t lowest_macro_loc = LINEMAPS_MACRO_LOWEST_LOCATION (set);
+  location_t lowest_macro_loc = LINEMAPS_MACRO_LOWEST_LOCATION (this);
   if (locus >= lowest_macro_loc)
     return false;
   if (src_range.m_start >= lowest_macro_loc)
@@ -171,17 +170,16 @@ can_be_stored_compactly_p (line_maps *set,
 /* Combine LOCUS and DATA to a combined adhoc loc.  */
 
 location_t
-get_combined_adhoc_loc (line_maps *set,
-			location_t locus,
-			source_range src_range,
-			void *data,
-			unsigned discriminator)
+line_maps::get_or_create_combined_loc (location_t locus,
+				       source_range src_range,
+				       void *data,
+				       unsigned discriminator)
 {
   struct location_adhoc_data lb;
   struct location_adhoc_data **slot;
 
   if (IS_ADHOC_LOC (locus))
-    locus = get_location_from_adhoc_loc (set, locus);
+    locus = get_location_from_adhoc_loc (this, locus);
   if (locus == 0 && data == NULL)
     return 0;
 
@@ -189,22 +187,22 @@ get_combined_adhoc_loc (line_maps *set,
      compressed ranges.  */
   linemap_assert (locus < RESERVED_LOCATION_COUNT
 		  || locus >= LINE_MAP_MAX_LOCATION_WITH_PACKED_RANGES
-		  || locus >= LINEMAPS_MACRO_LOWEST_LOCATION (set)
-		  || pure_location_p (set, locus));
+		  || locus >= LINEMAPS_MACRO_LOWEST_LOCATION (this)
+		  || pure_location_p (locus));
 
   /* Consider short-range optimization.  */
-  if (can_be_stored_compactly_p (set, locus, src_range, data, discriminator))
+  if (can_be_stored_compactly_p (locus, src_range, data, discriminator))
     {
       /* The low bits ought to be clear.  */
-      linemap_assert (pure_location_p (set, locus));
-      const line_map *map = linemap_lookup (set, locus);
+      linemap_assert (pure_location_p (locus));
+      const line_map *map = linemap_lookup (this, locus);
       const line_map_ordinary *ordmap = linemap_check_ordinary (map);
       unsigned int int_diff = src_range.m_finish - src_range.m_start;
       unsigned int col_diff = (int_diff >> ordmap->m_range_bits);
       if (col_diff < (1U << ordmap->m_range_bits))
 	{
 	  location_t packed = locus | col_diff;
-	  set->num_optimized_ranges++;
+	  m_num_optimized_ranges++;
 	  return packed;
 	}
     }
@@ -217,99 +215,128 @@ get_combined_adhoc_loc (line_maps *set,
     return locus;
 
   if (!data && discriminator == 0)
-    set->num_unoptimized_ranges++;
+    m_num_unoptimized_ranges++;
 
   lb.locus = locus;
   lb.src_range = src_range;
   lb.data = data;
   lb.discriminator = discriminator;
   slot = (struct location_adhoc_data **)
-      htab_find_slot (set->location_adhoc_data_map.htab, &lb, INSERT);
+      htab_find_slot (m_location_adhoc_data_map.htab, &lb, INSERT);
   if (*slot == NULL)
     {
-      if (set->location_adhoc_data_map.curr_loc >=
-	  set->location_adhoc_data_map.allocated)
+      if (m_location_adhoc_data_map.curr_loc >=
+	  m_location_adhoc_data_map.allocated)
 	{
-	  const auto orig_data = set->location_adhoc_data_map.data;
+	  const auto orig_data = m_location_adhoc_data_map.data;
 	  /* Cast away extern "C" from the type of xrealloc.  */
-	  line_map_realloc reallocator = (set->reallocator
-					  ? set->reallocator
+	  line_map_realloc reallocator = (m_reallocator
+					  ? m_reallocator
 					  : (line_map_realloc) xrealloc);
 
-	  if (set->location_adhoc_data_map.allocated == 0)
-	    set->location_adhoc_data_map.allocated = 128;
+	  if (m_location_adhoc_data_map.allocated == 0)
+	    m_location_adhoc_data_map.allocated = 128;
 	  else
-	    set->location_adhoc_data_map.allocated *= 2;
-	  set->location_adhoc_data_map.data = (struct location_adhoc_data *)
-	      reallocator (set->location_adhoc_data_map.data,
-			   set->location_adhoc_data_map.allocated
+	    m_location_adhoc_data_map.allocated *= 2;
+	  m_location_adhoc_data_map.data = (struct location_adhoc_data *)
+	      reallocator (m_location_adhoc_data_map.data,
+			   m_location_adhoc_data_map.allocated
 			   * sizeof (struct location_adhoc_data));
-	  if (set->location_adhoc_data_map.allocated > 128)
+	  if (m_location_adhoc_data_map.allocated > 128)
 	    {
 	      location_adhoc_data *param[2]
-		= {orig_data, set->location_adhoc_data_map.data};
-	      htab_traverse (set->location_adhoc_data_map.htab,
+		= {orig_data, m_location_adhoc_data_map.data};
+	      htab_traverse (m_location_adhoc_data_map.htab,
 			     location_adhoc_data_update, param);
 	    }
 	}
-      *slot = set->location_adhoc_data_map.data
-	      + set->location_adhoc_data_map.curr_loc;
-      set->location_adhoc_data_map.data[set->location_adhoc_data_map.curr_loc++]
+      *slot = m_location_adhoc_data_map.data
+	      + m_location_adhoc_data_map.curr_loc;
+      m_location_adhoc_data_map.data[m_location_adhoc_data_map.curr_loc++]
 	= lb;
     }
-  return ((*slot) - set->location_adhoc_data_map.data) | 0x80000000;
+  return ((*slot) - m_location_adhoc_data_map.data) | 0x80000000;
+}
+
+/* Construct a location with caret at CARET, ranging from START to
+   FINISH.
+
+   For example, consider:
+
+                 11111111112
+        12345678901234567890
+     522
+     523   return foo + bar;
+                  ~~~~^~~~~
+     524
+
+   The location's caret is at the "+", line 523 column 15, but starts
+   earlier, at the "f" of "foo" at column 11.  The finish is at the "r"
+   of "bar" at column 19.  */
+
+location_t
+line_maps::make_location (location_t caret, location_t start, location_t finish)
+{
+  location_t pure_loc = get_pure_location (caret);
+  source_range src_range;
+  src_range.m_start = get_start (start);
+  src_range.m_finish = get_finish (finish);
+  location_t combined_loc = get_or_create_combined_loc (pure_loc,
+							src_range,
+							nullptr,
+							0);
+  return combined_loc;
 }
 
 /* Return the data for the adhoc loc.  */
 
 void *
-get_data_from_adhoc_loc (const class line_maps *set, location_t loc)
+get_data_from_adhoc_loc (const line_maps *set, location_t loc)
 {
   linemap_assert (IS_ADHOC_LOC (loc));
-  return set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].data;
+  return set->m_location_adhoc_data_map.data[loc & MAX_LOCATION_T].data;
 }
 
 unsigned
-get_discriminator_from_adhoc_loc (const class line_maps *set, location_t loc)
+get_discriminator_from_adhoc_loc (const line_maps *set, location_t loc)
 {
   linemap_assert (IS_ADHOC_LOC (loc));
-  return set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].discriminator;
+  return set->m_location_adhoc_data_map.data[loc & MAX_LOCATION_T].discriminator;
 }
 
 /* Return the location for the adhoc loc.  */
 
 location_t
-get_location_from_adhoc_loc (const class line_maps *set, location_t loc)
+get_location_from_adhoc_loc (const line_maps *set, location_t loc)
 {
   linemap_assert (IS_ADHOC_LOC (loc));
-  return set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
+  return set->m_location_adhoc_data_map.data[loc & MAX_LOCATION_T].locus;
 }
 
 /* Return the source_range for adhoc location LOC.  */
 
-static source_range
-get_range_from_adhoc_loc (const class line_maps *set, location_t loc)
+source_range
+line_maps::get_range_from_adhoc_loc (location_t loc) const
 {
   linemap_assert (IS_ADHOC_LOC (loc));
-  return set->location_adhoc_data_map.data[loc & MAX_LOCATION_T].src_range;
+  return m_location_adhoc_data_map.data[loc & MAX_LOCATION_T].src_range;
 }
 
 /* Get the source_range of location LOC, either from the ad-hoc
    lookaside table, or embedded inside LOC itself.  */
 
 source_range
-get_range_from_loc (line_maps *set,
-		    location_t loc)
+line_maps::get_range_from_loc (location_t loc) const
 {
   if (IS_ADHOC_LOC (loc))
-    return get_range_from_adhoc_loc (set, loc);
+    return get_range_from_adhoc_loc (loc);
 
   /* For ordinary maps, extract packed range.  */
   if (loc >= RESERVED_LOCATION_COUNT
-      && loc < LINEMAPS_MACRO_LOWEST_LOCATION (set)
+      && loc < LINEMAPS_MACRO_LOWEST_LOCATION (this)
       && loc <= LINE_MAP_MAX_LOCATION_WITH_PACKED_RANGES)
     {
-      const line_map *map = linemap_lookup (set, loc);
+      const line_map *map = linemap_lookup (this, loc);
       const line_map_ordinary *ordmap = linemap_check_ordinary (map);
       source_range result;
       int offset = loc & ((1 << ordmap->m_range_bits) - 1);
@@ -321,8 +348,15 @@ get_range_from_loc (line_maps *set,
   return source_range::from_location (loc);
 }
 
+source_range
+get_range_from_loc (const line_maps *set,
+		    location_t loc)
+{
+  return set->get_range_from_loc (loc);
+}
+
 unsigned
-get_discriminator_from_loc (line_maps *set,
+get_discriminator_from_loc (const line_maps *set,
 			    location_t loc)
 {
   if (IS_ADHOC_LOC (loc))
@@ -334,12 +368,12 @@ get_discriminator_from_loc (line_maps *set,
    whether it is an ad-hoc location, or embeds range information.  */
 
 bool
-pure_location_p (line_maps *set, location_t loc)
+line_maps::pure_location_p (location_t loc) const
 {
   if (IS_ADHOC_LOC (loc))
     return false;
 
-  const line_map *map = linemap_lookup (set, loc);
+  const line_map *map = linemap_lookup (this, loc);
   if (map == NULL)
     return true;
   const line_map_ordinary *ordmap = linemap_check_ordinary (map);
@@ -350,27 +384,39 @@ pure_location_p (line_maps *set, location_t loc)
   return true;
 }
 
+bool
+pure_location_p (const line_maps *set, location_t loc)
+{
+  return set->pure_location_p (loc);
+}
+
 /* Given location LOC within SET, strip away any packed range information
    or ad-hoc information.  */
 
 location_t
-get_pure_location (line_maps *set, location_t loc)
+line_maps::get_pure_location (location_t loc) const
 {
   if (IS_ADHOC_LOC (loc))
-    loc = get_location_from_adhoc_loc (set, loc);
+    loc = get_location_from_adhoc_loc (this, loc);
 
-  if (loc >= LINEMAPS_MACRO_LOWEST_LOCATION (set))
+  if (loc >= LINEMAPS_MACRO_LOWEST_LOCATION (this))
     return loc;
 
   if (loc < RESERVED_LOCATION_COUNT)
     return loc;
 
-  const line_map *map = linemap_lookup (set, loc);
+  const line_map *map = linemap_lookup (this, loc);
   const line_map_ordinary *ordmap = linemap_check_ordinary (map);
 
   return loc & ~((1 << ordmap->m_range_bits) - 1);
 }
 
+location_t
+get_pure_location (const line_maps *set, location_t loc)
+{
+  return set->get_pure_location (loc);
+}
+
 /* Initialize a line map set.  */
 
 void
@@ -384,10 +430,10 @@ linemap_init (line_maps *set,
   new (set) line_maps();
 #endif
   /* Set default reallocator (used for initial alloc too).  */
-  set->reallocator = xrealloc;
+  set->m_reallocator = xrealloc;
   set->highest_location = RESERVED_LOCATION_COUNT - 1;
   set->highest_line = RESERVED_LOCATION_COUNT - 1;
-  set->location_adhoc_data_map.htab =
+  set->m_location_adhoc_data_map.htab =
       htab_create (100, location_adhoc_data_hash, location_adhoc_data_eq, NULL);
   set->builtin_location = builtin_location;
 }
@@ -396,7 +442,7 @@ linemap_init (line_maps *set,
    NULL if MAP was not an include.  */
 
 const line_map_ordinary *
-linemap_included_from_linemap (line_maps *set, const line_map_ordinary *map)
+linemap_included_from_linemap (const line_maps *set, const line_map_ordinary *map)
 {
   return linemap_ordinary_map_lookup (set, linemap_included_from (map));
 }
@@ -404,7 +450,7 @@ linemap_included_from_linemap (line_maps *set, const line_map_ordinary *map)
 /* Check for and warn about line_maps entered but not exited.  */
 
 void
-linemap_check_files_exited (line_maps *set)
+linemap_check_files_exited (const line_maps *set)
 {
   /* Depending upon whether we are handling preprocessed input or
      not, this can be a user error or an ICE.  */
@@ -453,13 +499,13 @@ line_map_new_raw (line_maps *set, bool macro_p, unsigned num)
 	 allocator may well be larger than what we ask for.  Use this
 	 hook to find what that size is.  */
       size_t alloc_size
-	= set->round_alloc_size (num_maps_allocated * size_of_a_map);
+	= set->m_round_alloc_size (num_maps_allocated * size_of_a_map);
 
       /* Now alloc_size contains the exact memory size we would get if
 	 we have asked for the initial alloc_size amount of memory.
 	 Let's get back to the number of map that amounts to.  */
       unsigned num_maps = alloc_size / size_of_a_map;
-      buffer = set->reallocator (buffer, num_maps * size_of_a_map);
+      buffer = set->m_reallocator (buffer, num_maps * size_of_a_map);
       memset ((char *)buffer + num_maps_used * size_of_a_map, 0,
 	      (num_maps - num_maps_used) * size_of_a_map);
       if (macro_p)
@@ -592,7 +638,7 @@ linemap_add (line_maps *set, enum lc_reason reason,
   map->sysp = sysp;
   map->to_file = to_file;
   map->to_line = to_line;
-  LINEMAPS_ORDINARY_CACHE (set) = LINEMAPS_ORDINARY_USED (set) - 1;
+  set->info_ordinary.m_cache = LINEMAPS_ORDINARY_USED (set) - 1;
   /* Do not store range_bits here.  That's readjusted in
      linemap_line_start.  */
   map->m_range_bits = map->m_column_and_range_bits = 0;
@@ -690,9 +736,9 @@ linemap_module_restore (line_maps *set, unsigned lwm)
    macro expansion, FALSE otherwise.  */
 
 bool
-linemap_tracks_macro_expansion_locs_p (line_maps *set)
+linemap_tracks_macro_expansion_locs_p (const line_maps *set)
 {
-  return LINEMAPS_MACRO_MAPS (set) != NULL;
+  return set->info_macro.maps != nullptr;
 }
 
 /* Create a macro map.  A macro map encodes source locations of tokens
@@ -734,14 +780,13 @@ linemap_enter_macro (class line_maps *set, struct cpp_hashnode *macro_node,
   map->macro = macro_node;
   map->n_tokens = num_tokens;
   map->macro_locations
-    = (location_t*) set->reallocator (NULL,
-					   2 * num_tokens
-					   * sizeof (location_t));
+    = (location_t*) set->m_reallocator (nullptr,
+					2 * num_tokens * sizeof (location_t));
   map->expansion = expansion;
   memset (MACRO_MAP_LOCATIONS (map), 0,
 	  2 * num_tokens * sizeof (location_t));
 
-  LINEMAPS_MACRO_CACHE (set) = LINEMAPS_MACRO_USED (set) - 1;
+  set->info_macro.m_cache = LINEMAPS_MACRO_USED (set) - 1;
 
   return map;
 }
@@ -1071,7 +1116,7 @@ linemap_ordinary_map_lookup (const line_maps *set, location_t line)
   if (set ==  NULL || line < RESERVED_LOCATION_COUNT)
     return NULL;
 
-  unsigned mn = LINEMAPS_ORDINARY_CACHE (set);
+  unsigned mn = set->info_ordinary.m_cache;
   unsigned mx = LINEMAPS_ORDINARY_USED (set);
 
   const line_map_ordinary *cached = LINEMAPS_ORDINARY_MAP_AT (set, mn);
@@ -1096,7 +1141,7 @@ linemap_ordinary_map_lookup (const line_maps *set, location_t line)
 	mn = md;
     }
 
-  LINEMAPS_ORDINARY_CACHE (set) = mn;
+  set->info_ordinary.m_cache = mn;
   const line_map_ordinary *result = LINEMAPS_ORDINARY_MAP_AT (set, mn);
   linemap_assert (line >= MAP_START_LOCATION (result));
   return result;
@@ -1128,7 +1173,7 @@ linemap_macro_map_lookup (const line_maps *set, location_t line)
 unsigned
 linemap_lookup_macro_index (const line_maps *set, location_t line)
 {
-  unsigned mn = LINEMAPS_MACRO_CACHE (set);
+  unsigned mn = set->info_macro.m_cache;
   unsigned mx = LINEMAPS_MACRO_USED (set);
   const struct line_map_macro *cached = LINEMAPS_MACRO_MAP_AT (set, mn);
 
@@ -1150,7 +1195,7 @@ linemap_lookup_macro_index (const line_maps *set, location_t line)
 	mx = md;
     }
 
-  LINEMAPS_MACRO_CACHE (set) = mx;
+  set->info_macro.m_cache = mx;
   return mx;
 }
 
@@ -1214,7 +1259,7 @@ linemap_macro_map_loc_to_def_point (const line_map_macro *map,
    In other words, this returns the xI location presented in the
    comments of line_map_macro above.  */
 location_t
-linemap_macro_map_loc_unwind_toward_spelling (line_maps *set,
+linemap_macro_map_loc_unwind_toward_spelling (const line_maps *set,
 					      const line_map_macro* map,
 					      location_t location)
 {
@@ -1243,7 +1288,7 @@ linemap_macro_map_loc_unwind_toward_spelling (line_maps *set,
    macro expansion point.  */
 
 int
-linemap_get_expansion_line (line_maps *set,
+linemap_get_expansion_line (const line_maps *set,
 			    location_t location)
 {
   const line_map_ordinary *map = NULL;
@@ -1270,7 +1315,7 @@ linemap_get_expansion_line (line_maps *set,
    SET is the line map set LOCATION comes from.  */
 
 const char*
-linemap_get_expansion_filename (line_maps *set,
+linemap_get_expansion_filename (const line_maps *set,
 				location_t location)
 {
   const struct line_map_ordinary *map = NULL;
@@ -1306,7 +1351,7 @@ linemap_map_get_macro_name (const line_map_macro *macro_map)
    header, but expanded in a non-system file.  */
 
 int
-linemap_location_in_system_header_p (line_maps *set,
+linemap_location_in_system_header_p (const line_maps *set,
 				     location_t location)
 {
   const struct line_map *map = NULL;
@@ -1366,7 +1411,7 @@ linemap_location_from_macro_expansion_p (const class line_maps *set,
    virtual location of the token inside the resulting macro.  */
 
 static const struct line_map*
-first_map_in_common_1 (line_maps *set,
+first_map_in_common_1 (const line_maps *set,
 		       location_t *loc0,
 		       location_t *loc1)
 {
@@ -1413,7 +1458,7 @@ first_map_in_common_1 (line_maps *set,
    return of a non-NULL result.  */
 
 const struct line_map*
-first_map_in_common (line_maps *set,
+first_map_in_common (const line_maps *set,
 		     location_t loc0,
 		     location_t loc1,
 		     location_t  *res_loc0,
@@ -1431,7 +1476,7 @@ first_map_in_common (line_maps *set,
    otherwise.  */
 
 int
-linemap_compare_locations (line_maps *set,
+linemap_compare_locations (const line_maps *set,
 			   location_t  pre,
 			   location_t post)
 {
@@ -1506,7 +1551,7 @@ trace_include (const class line_maps *set, const line_map_ordinary *map)
    This is a subroutine for linemap_resolve_location.  */
 
 static location_t
-linemap_macro_loc_to_spelling_point (line_maps *set,
+linemap_macro_loc_to_spelling_point (const line_maps *set,
 				     location_t location,
 				     const line_map_ordinary **original_map)
 {
@@ -1540,7 +1585,7 @@ linemap_macro_loc_to_spelling_point (line_maps *set,
    This is a subroutine of linemap_resolve_location.  */
 
 static location_t
-linemap_macro_loc_to_def_point (line_maps *set,
+linemap_macro_loc_to_def_point (const line_maps *set,
 				location_t location,
 				const line_map_ordinary **original_map)
 {
@@ -1582,7 +1627,7 @@ linemap_macro_loc_to_def_point (line_maps *set,
    This is a subroutine of linemap_resolve_location.  */
 
 static location_t
-linemap_macro_loc_to_exp_point (line_maps *set,
+linemap_macro_loc_to_exp_point (const line_maps *set,
 				location_t location,
 				const line_map_ordinary **original_map)
 {
@@ -1656,7 +1701,7 @@ linemap_macro_loc_to_exp_point (line_maps *set,
    UNKNOWN_LOCATION or BUILTINS_LOCATION in GCC.  */
 
 location_t
-linemap_resolve_location (line_maps *set,
+linemap_resolve_location (const line_maps *set,
 			  location_t loc,
 			  enum location_resolution_kind lrk,
 			  const line_map_ordinary **map)
@@ -1696,7 +1741,7 @@ linemap_resolve_location (line_maps *set,
    definition of a macro, FALSE otherwise.  */
 
 bool
-linemap_location_from_macro_definition_p (line_maps *set,
+linemap_location_from_macro_definition_p (const line_maps *set,
 					  location_t loc)
 {
   if (IS_ADHOC_LOC (loc))
@@ -1736,7 +1781,7 @@ linemap_location_from_macro_definition_p (line_maps *set,
    to the map of the returned location.  */
 
 location_t
-linemap_unwind_toward_expansion (line_maps *set,
+linemap_unwind_toward_expansion (const line_maps *set,
 				 location_t loc,
 				 const struct line_map **map)
 {
@@ -1776,7 +1821,7 @@ linemap_unwind_toward_expansion (line_maps *set,
    *MAP is set to the map of the returned location if the later is
    different from LOC.  */
 location_t
-linemap_unwind_to_first_non_reserved_loc (line_maps *set,
+linemap_unwind_to_first_non_reserved_loc (const line_maps *set,
 					  location_t loc,
 					  const struct line_map **map)
 {
@@ -1820,7 +1865,7 @@ linemap_unwind_to_first_non_reserved_loc (line_maps *set,
    location is returned.  */
 
 expanded_location
-linemap_expand_location (line_maps *set,
+linemap_expand_location (const line_maps *set,
 			 const struct line_map *map,
 			 location_t loc)
 
@@ -1869,7 +1914,7 @@ linemap_expand_location (line_maps *set,
    dump a macro map, false otherwise.  */
 
 void
-linemap_dump (FILE *stream, class line_maps *set, unsigned ix, bool is_macro)
+linemap_dump (FILE *stream, const line_maps *set, unsigned ix, bool is_macro)
 {
   const char *const lc_reasons_v[LC_HWM]
       = { "LC_ENTER", "LC_LEAVE", "LC_RENAME", "LC_RENAME_VERBATIM",
@@ -1925,7 +1970,7 @@ linemap_dump (FILE *stream, class line_maps *set, unsigned ix, bool is_macro)
    stream STREAM. SET is the line map set LOC comes from.  */
 
 void
-linemap_dump_location (line_maps *set,
+linemap_dump_location (const line_maps *set,
 		       location_t loc,
 		       FILE *stream)
 {
@@ -1975,7 +2020,7 @@ linemap_dump_location (line_maps *set,
    location emitted for that file.  */
 
 bool
-linemap_get_file_highest_location (line_maps *set,
+linemap_get_file_highest_location (const line_maps *set,
 				   const char *file_name,
 				   location_t *loc)
 {
@@ -2013,7 +2058,7 @@ linemap_get_file_highest_location (line_maps *set,
    parts of the line table SET.  */
 
 void
-linemap_get_statistics (line_maps *set,
+linemap_get_statistics (const line_maps *set,
 			struct linemap_stats *s)
 {
   long ordinary_maps_allocated_size, ordinary_maps_used_size,
@@ -2031,7 +2076,7 @@ linemap_get_statistics (line_maps *set,
   macro_maps_allocated_size =
     LINEMAPS_MACRO_ALLOCATED (set) * sizeof (struct line_map_macro);
 
-  for (cur_map = LINEMAPS_MACRO_MAPS (set);
+  for (cur_map = set->info_macro.maps;
        cur_map && cur_map <= LINEMAPS_LAST_MACRO_MAP (set);
        ++cur_map)
     {
@@ -2066,9 +2111,9 @@ linemap_get_statistics (line_maps *set,
   s->macro_maps_used_size = macro_maps_used_size;
   s->duplicated_macro_maps_locations_size =
     duplicated_macro_maps_locations_size;
-  s->adhoc_table_size = (set->location_adhoc_data_map.allocated
+  s->adhoc_table_size = (set->m_location_adhoc_data_map.allocated
 			 * sizeof (struct location_adhoc_data));
-  s->adhoc_table_entries_used = set->location_adhoc_data_map.curr_loc;
+  s->adhoc_table_entries_used = set->m_location_adhoc_data_map.curr_loc;
 }
 
 
@@ -2077,7 +2122,7 @@ linemap_get_statistics (line_maps *set,
    specifies how many macro maps to dump.  */
 
 void
-line_table_dump (FILE *stream, class line_maps *set, unsigned int num_ordinary,
+line_table_dump (FILE *stream, const line_maps *set, unsigned int num_ordinary,
 		 unsigned int num_macro)
 {
   unsigned int i;