+2017-06-09 David Malcolm <dmalcolm@redhat.com>
+
+ * diagnostic.c (diagnostic_report_diagnostic): Only add fixits
+ to the edit_context if they can be auto-applied.
+
2017-06-9 Ian Lance Taylor <iant@golang.org>
* opts.c (finish_options): If -fsplit-stack, disable implicit
diagnostic->x_data = NULL;
if (context->edit_context_ptr)
- context->edit_context_ptr->add_fixits (diagnostic->richloc);
+ if (diagnostic->richloc->fixits_can_be_auto_applied_p ())
+ context->edit_context_ptr->add_fixits (diagnostic->richloc);
context->lock--;
+2017-06-09 David Malcolm <dmalcolm@redhat.com>
+
+ * 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".
+
2017-06-09 Ian Lance Taylor <iant@golang.org>
* gcc.dg/tree-prof/split-1.c: New test.
{ dg-end-multiline-output "" } */
#endif
}
+
+/* Unit test for mutually-exclusive suggestions. */
+
+void test_mutually_exclusive_suggestions (void)
+{
+#if 0
+ original; /* { dg-warning "warning 1" } */
+/* { dg-warning "warning 2" "" { target *-*-* } .-1 } */
+/* { dg-begin-multiline-output "" }
+ original;
+ ^~~~~~~~
+ replacement_1
+ { dg-end-multiline-output "" } */
+/* { dg-begin-multiline-output "" }
+ original;
+ ^~~~~~~~
+ replacement_2
+ { dg-end-multiline-output "" } */
+#endif
+}
#endif
}
+/* Unit test for mutually-exclusive suggestions. */
+
+void test_mutually_exclusive_suggestions (void)
+{
+#if 0
+ original; /* { dg-warning "warning 1" } */
+/* { dg-warning "warning 2" "" { target *-*-* } .-1 } */
+/* We should not print the mutually-incompatible fix-it hints within
+ the generated patch; they are not listed in the big expected
+ multiline output below. */
+#endif
+}
+
/* Verify the output from -fdiagnostics-generate-patch.
We expect a header, containing the filename. This is the absolute path,
so we can only capture it via regexps. */
/* { dg-regexp "fix-it:.*\\{52:1-52:1\\}:.*\\n" } */
#endif
}
+
+/* Unit test for mutually-exclusive suggestions. */
+
+void test_mutually_exclusive_suggestions (void)
+{
+#if 0
+ original; /* { dg-warning "warning 1" } */
+/* { dg-warning "warning 2" "" { target *-*-* } .-1 } */
+/* We should print the mutually-incompatible fix-it hints within
+ -fdiagnostics-parseable-fixits; verify that they are printed. */
+/* { dg-regexp "fix-it:.*\\{64:3-64:11}:.*\\n" } */
+/* { dg-regexp "fix-it:.*\\{64:3-64:11}:.*\\n" } */
+#endif
+}
warning_at_rich_loc (&richloc, 0, "example of a replacement hint");
}
+ if (0 == strcmp (fnname, "test_mutually_exclusive_suggestions"))
+ {
+ const int line = fnstart_line + 2;
+ location_t start = get_loc (line, 2);
+ location_t finish = get_loc (line, 9);
+ source_range src_range;
+ src_range.m_start = start;
+ src_range.m_finish = finish;
+
+ {
+ rich_location richloc (line_table, make_location (start, start, finish));
+ richloc.add_fixit_replace (src_range, "replacement_1");
+ richloc.fixits_cannot_be_auto_applied ();
+ warning_at_rich_loc (&richloc, 0, "warning 1");
+ }
+
+ {
+ rich_location richloc (line_table, make_location (start, start, finish));
+ richloc.add_fixit_replace (src_range, "replacement_2");
+ richloc.fixits_cannot_be_auto_applied ();
+ warning_at_rich_loc (&richloc, 0, "warning 2");
+ }
+ }
+
/* Example of two carets where both carets appear to have an off-by-one
error appearing one column early.
Seen with gfortran.dg/associate_5.f03.
+2017-06-09 David Malcolm <dmalcolm@redhat.com>
+
+ * 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.
+
2017-06-05 David Malcolm <dmalcolm@redhat.com>
* include/cpplib.h (struct cpp_callbacks): Add "comment"
fixit_hint *get_last_fixit_hint () const;
bool seen_impossible_fixit_p () const { return m_seen_impossible_fixit; }
+ /* Set this if the fix-it hints are not suitable to be
+ automatically applied.
+
+ For example, if you are suggesting more than one
+ mutually exclusive solution to a problem, then
+ it doesn't make sense to apply all of the solutions;
+ manual intervention is required.
+
+ If set, then the fix-it hints in the rich_location will
+ be printed, but will not be added to generated patches,
+ or affect the modified version of the file. */
+ void fixits_cannot_be_auto_applied ()
+ {
+ m_fixits_cannot_be_auto_applied = true;
+ }
+
+ bool fixits_can_be_auto_applied_p () const
+ {
+ return !m_fixits_cannot_be_auto_applied;
+ }
+
private:
bool reject_impossible_fixit (source_location where);
void stop_supporting_fixits ();
semi_embedded_vec <fixit_hint *, MAX_STATIC_FIXIT_HINTS> m_fixit_hints;
bool m_seen_impossible_fixit;
+ bool m_fixits_cannot_be_auto_applied;
};
/* A fix-it hint: a suggested insertion, replacement, or deletion of text.
m_column_override (0),
m_have_expanded_location (false),
m_fixit_hints (),
- m_seen_impossible_fixit (false)
+ m_seen_impossible_fixit (false),
+ m_fixits_cannot_be_auto_applied (false)
{
add_range (loc, true);
}
projects / gcc.git / commitdiff