This patch adds a method: rich_location::fixits_cannot_be_auto_applied for ensuring that mutually-incompatible fix-its hints don't lead to insane output from -fdiagnostics-generate-patch. Fix-it hints within such rich_location instances are printed as normal by diagnostic_show_locus, but don't affect the output of -fdiagnostics-generate-patch. gcc/ChangeLog: * diagnostic.c (diagnostic_report_diagnostic): Only add fixits to the edit_context if they can be auto-applied. gcc/testsuite/ChangeLog: * gcc.dg/plugin/diagnostic-test-show-locus-bw.c (test_mutually_exclusive_suggestions): New test function. * gcc.dg/plugin/diagnostic-test-show-locus-generate-patch.c (test_mutually_exclusive_suggestions): New test function. * gcc.dg/plugin/diagnostic-test-show-locus-parseable-fixits.c (test_mutually_exclusive_suggestions): New test function. * gcc.dg/plugin/diagnostic_plugin_test_show_locus.c (test_show_locus): Add special-case for "test_mutually_exclusive_suggestions". libcpp/ChangeLog: * include/line-map.h (rich_location::fixits_cannot_be_auto_applied): New method. (rich_location::fixits_can_be_auto_applied_p): New accessor. (rich_location::m_fixits_cannot_be_auto_applied): New field. * line-map.c (rich_location::rich_location): Initialize new field. From-SVN: r249081
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| include | Loading commit data... | |
| po | Loading commit data... | |
| ChangeLog | Loading commit data... | |
| ChangeLog.jit | Loading commit data... | |
| Makefile.in | Loading commit data... | |
| aclocal.m4 | Loading commit data... | |
| charset.c | Loading commit data... | |
| config.in | Loading commit data... | |
| configure | Loading commit data... | |
| configure.ac | Loading commit data... | |
| directives-only.c | Loading commit data... | |
| directives.c | Loading commit data... | |
| errors.c | Loading commit data... | |
| expr.c | Loading commit data... | |
| files.c | Loading commit data... | |
| identifiers.c | Loading commit data... | |
| init.c | Loading commit data... | |
| internal.h | Loading commit data... | |
| lex.c | Loading commit data... | |
| line-map.c | Loading commit data... | |
| location-example.txt | Loading commit data... | |
| macro.c | Loading commit data... | |
| makeucnid.c | Loading commit data... | |
| mkdeps.c | Loading commit data... | |
| pch.c | Loading commit data... | |
| symtab.c | Loading commit data... | |
| system.h | Loading commit data... | |
| traditional.c | Loading commit data... | |
| ucnid.h | Loading commit data... | |
| ucnid.tab | Loading commit data... |