David Malcolm b4f3232d69 PR c++/70105: prevent nonsensical underline spew for macro expansions ... diagnostic_show_locus can sometimes do the wrong thing when handling expressions built up from macros. PR c++/70105 (currently marked as a P3 regression) has an example of a diagnostic where over 500 lines of irrelevant source are printed, and underlined, giving >1000 lines of useless spew to stderr. This patch adds extra sanitization to diagnostic-show-locus.c, so that we only attempt to print underlines and secondary locations if such locations are "sufficiently sane" relative to the primary location of a diagnostic. This "sufficiently sane" condition is implemented by a new helper function compatible_locations_p, which requires such locations to have the same macro expansion hierarchy as the primary location, using linemap_macro_map_loc_unwind_toward_spelling, effectively mimicing the expansion performed by LRK_SPELLING_LOCATION. This may be too strong a condition, but it effectively fixes PR c++/70105, without removing any underlines in my testing. Successfully bootstrapped&regrtested in combination with the previous patch on x86_64-pc-linux-gnu; adds 15 new PASS results to g++.sum and 4 new PASS results to gcc.sum. gcc/ChangeLog: PR c/68473 PR c++/70105 * diagnostic-show-locus.c (compatible_locations_p): New function. (layout::layout): Sanitize ranges using compatible_locations_p. gcc/testsuite/ChangeLog: PR c/68473 PR c++/70105 * g++.dg/diagnostic/pr70105.C: New test. * gcc.dg/plugin/diagnostic-test-expressions-1.c (foo): New decl. (test_multiple_ordinary_maps): New test function. libcpp/ChangeLog: PR c/68473 PR c++/70105 * line-map.c (linemap_macro_map_loc_unwind_toward_spelling): Move decl... * include/line-map.h (linemap_macro_map_loc_unwind_toward_spelling): ...here, converting from static to extern. From-SVN: r234088		2016-03-09 18:23:27 +00:00
..
include	PR c++/70105: prevent nonsensical underline spew for macro expansions	2016-03-09 18:23:27 +00:00
po	* sr.po: Update.	2016-03-05 12:07:03 +00:00
aclocal.m4
ChangeLog	PR c++/70105: prevent nonsensical underline spew for macro expansions	2016-03-09 18:23:27 +00:00
ChangeLog.jit
charset.c	re PR c++/69628 (Conditional jump or move depends on uninitialised value(s) in lex_charconst(cpp_token const*) (c-lex.c:1252))	2016-02-05 20:39:48 +01:00
config.in
configure
configure.ac
directives-only.c
directives.c
errors.c	PR preprocessor/69664: fix rich_location::override_column	2016-02-08 17:33:45 +00:00
expr.c
files.c
identifiers.c
init.c
internal.h
lex.c
line-map.c	PR c++/70105: prevent nonsensical underline spew for macro expansions	2016-03-09 18:23:27 +00:00
location-example.txt
macro.c
Makefile.in
makeucnid.c
mkdeps.c
pch.c
symtab.c
system.h
traditional.c
ucnid.h
ucnid.tab