On 1/27/20 2:38 PM, David Malcolm wrote:
Please add an
auto_diagnostic_group d;
here, so that -fdiagnostics-format=json can nest the note below the
error.
OK with that change.
Sure, there's one another patch that does the for all error+inform
in the function.
Patch can bootstrap on x86_64-linux-gnu and survives regression tests.
Ready to be installed?
Thanks,
Martin
>From 8c2facb9b82519b10e8a7a279cf85f3ab88de1d5 Mon Sep 17 00:00:00 2001
From: Martin Liska <mli...@suse.cz>
Date: Mon, 27 Jan 2020 15:03:55 +0100
Subject: [PATCH] Add couple of auto_diagnostic_group in
redeclare_class_template.
gcc/cp/ChangeLog:
2020-01-27 Martin Liska <mli...@suse.cz>
PR c++/92440
* pt.c (redeclare_class_template): Group couple of
errors and inform messages with auto_diagnostic_group.
---
gcc/cp/pt.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index b8acedeaa5a..ed5df1e9841 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6148,6 +6148,7 @@ redeclare_class_template (tree type, tree parms, tree cons)
&& (TEMPLATE_PARM_PARAMETER_PACK (DECL_INITIAL (tmpl_parm))
!= TEMPLATE_PARM_PARAMETER_PACK (DECL_INITIAL (parm)))))
{
+ auto_diagnostic_group d;
error ("template parameter %q+#D", tmpl_parm);
inform (input_location, "redeclared here as %q#D", parm);
return false;
@@ -6159,6 +6160,7 @@ redeclare_class_template (tree type, tree parms, tree cons)
tree p2 = TREE_VEC_ELT (parms, i);
if (!template_parameter_constraints_equivalent_p (p1, p2))
{
+ auto_diagnostic_group d;
error ("declaration of template parameter %q+#D with different "
"constraints", parm);
inform (DECL_SOURCE_LOCATION (tmpl_parm),
@@ -6172,6 +6174,7 @@ redeclare_class_template (tree type, tree parms, tree cons)
A template-parameter may not be given default arguments
by two different declarations in the same scope. */
+ auto_diagnostic_group d;
error_at (input_location, "redefinition of default argument for %q#D", parm);
inform (DECL_SOURCE_LOCATION (tmpl_parm),
"original definition appeared here");
@@ -6206,6 +6209,7 @@ redeclare_class_template (tree type, tree parms, tree cons)
/* Two classes with different constraints declare different entities. */
if (!cp_tree_equal (req1, req2))
{
+ auto_diagnostic_group d;
error_at (input_location, "redeclaration %q#D with different "
"constraints", tmpl);
inform (DECL_SOURCE_LOCATION (tmpl),
--
2.25.0
