diff mbox

[committed] PR c/70264: fix crash in compatible_locations_p with BUILTINS_LOCATION

Message ID 1458240854-37053-1-git-send-email-dmalcolm@redhat.com
State New
Headers show

Commit Message

David Malcolm March 17, 2016, 6:54 p.m. UTC 
In r234088 my fix for PR c++/70105 didn't allow for the possibility that
when comparing a pair of macro expansion histories that one of the
macros in the history might not be located within a line-map, and
PR c/70264 reports a crash due to encountering BUILTINS_LOCATION within
the traversal.

Fixed thusly.

Successfully bootstrapped on x86_64-pc-linux-gnu; adds 4 PASS results
to gcc.sum and 12 to g++.sum.

Committed to trunk as r234303.

gcc/ChangeLog:
	PR c/70264
	* diagnostic-show-locus.c (compatible_locations_p): Handle the case
	where one or both locations aren't within a line_map.

gcc/testsuite/ChangeLog:
	PR c/70264
	* c-c++-common/pr70264.c: New test case.
---
 gcc/diagnostic-show-locus.c          |  6 ++++++
 gcc/testsuite/c-c++-common/pr70264.c | 13 +++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 gcc/testsuite/c-c++-common/pr70264.c
diff mbox

Patch

diff --git a/gcc/diagnostic-show-locus.c b/gcc/diagnostic-show-locus.c
index 55ee6b6..6314675 100644
--- a/gcc/diagnostic-show-locus.c
+++ b/gcc/diagnostic-show-locus.c
@@ -490,6 +490,12 @@  compatible_locations_p (location_t loc_a, location_t loc_b)
   if (IS_ADHOC_LOC (loc_b))
     loc_b = get_location_from_adhoc_loc (line_table, loc_b);
 
+  /* If either location is one of the special locations outside of a
+     linemap, they are only compatible if they are equal.  */
+  if (loc_a < RESERVED_LOCATION_COUNT
+      || loc_b < RESERVED_LOCATION_COUNT)
+    return loc_a == loc_b;
+
   const line_map *map_a = linemap_lookup (line_table, loc_a);
   linemap_assert (map_a);
 
diff --git a/gcc/testsuite/c-c++-common/pr70264.c b/gcc/testsuite/c-c++-common/pr70264.c
new file mode 100644
index 0000000..815aad1
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr70264.c
@@ -0,0 +1,13 @@ 
+/* { dg-options "-fdiagnostics-show-caret" } */
+
+#define X __LINE__ /* { dg-error "expected" } */
+X
+
+/* { dg-begin-multiline-output "" }
+ #define X __LINE__
+           ^
+   { dg-end-multiline-output "" } */
+/* { dg-begin-multiline-output "" }
+ X
+ ^
+   { dg-end-multiline-output "" } */