libcpp: Avoid unnecessary ad-hoc uses for large source files

libcpp/ChangeLog:
	* line-map.c (get_combined_adhoc_loc): Remove condition
	on locus < RESERVED_LOCATION_COUNT when considering
	whether a caret == start == finish location can be
	simply stored as the caret location.

From-SVN: r231918

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 9b296fd836a3ad9be36f5bc0d32bf7bcbc52de77..09b8e1825e9bc95061d8b5c7aaa37e8aa113a32e 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-22  David Malcolm  <dmalcolm@redhat.com>
+
+       * line-map.c (get_combined_adhoc_loc): Remove condition
+       on locus < RESERVED_LOCATION_COUNT when considering
+       whether a caret == start == finish location can be
+       simply stored as the caret location.
+
 2015-12-07  David Malcolm  <dmalcolm@redhat.com>
 
        * include/line-map.h (rich_location::set_range): Add line_maps *

diff --git a/libcpp/line-map.c b/libcpp/line-map.c
index 209d0fbe656c22a639ae2bc5292d21b51ae9316d..c20a32b5f0f4dc89610b688589f78304d81a8c04 100644 (file)
--- a/libcpp/line-map.c
+++ b/libcpp/line-map.c
@@ -196,10 +196,9 @@ get_combined_adhoc_loc (struct line_maps *set,
        }
     }
 
-  /* We can also compactly store the reserved locations
+  /* We can also compactly store locations
      when locus == start == finish (and data is NULL).  */
-  if (locus < RESERVED_LOCATION_COUNT
-      && locus == src_range.m_start
+  if (locus == src_range.m_start
       && locus == src_range.m_finish
       && !data)
     return locus;