FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: Error recovery in merge_default_template_args [PR108206]

Browse source 
We ICE on the following testcase during error recovery, both new_parm
and old_parm are error_mark_node, the ICE is on
          error ("redefinition of default argument for %q+#D", new_parm);
          inform (DECL_SOURCE_LOCATION (old_parm),
                  "original definition appeared here");
where we don't print anything useful for new_parm and ICE trying to
access DECL_SOURCE_LOCATION of old_parm.  I think we shouldn't diagnose
anything when either of the parms is erroneous, GCC 11 before
merge_default_template_args has been added was doing
      if (TREE_VEC_ELT (tmpl_parms, i) == error_mark_node
          || TREE_VEC_ELT (parms, i) == error_mark_node)
        continue;

      tmpl_parm = TREE_VALUE (TREE_VEC_ELT (tmpl_parms, i));
      if (error_operand_p (tmpl_parm))
        return false;
in redeclare_class_template.

2023-01-04  Jakub Jelinek  <jakub@redhat.com>

	PR c++/108206
	* decl.cc (merge_default_template_args): Return false if either
	new_parm or old_parm are erroneous.

	* g++.dg/template/pr108206.C: New test.
This commit is contained in:
Jakub Jelinek 2023-01-04 18:42:31 +01:00
parent edc038863d
commit fc349931ad
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/cp/decl.cc
View file

@ -1556,6 +1556,8 @@ merge_default_template_args (tree new_parms, tree old_parms, bool class_p)
tree old_parm = TREE_VALUE (TREE_VEC_ELT (old_parms, i));
tree& new_default = TREE_PURPOSE (TREE_VEC_ELT (new_parms, i));
tree& old_default = TREE_PURPOSE (TREE_VEC_ELT (old_parms, i));
if (error_operand_p (new_parm) || error_operand_p (old_parm))
return false;
if (new_default != NULL_TREE && old_default != NULL_TREE)
{
auto_diagnostic_group d;

5
gcc/testsuite/g++.dg/template/pr108206.C Normal file
View file

@ -0,0 +1,5 @@
// PR c++/108206
// { dg-do compile { target c++11 } }
template <X x, typename T1> void foo (T1); // { dg-error "'X' has not been declared" }
template <X x, typename T2> void foo (T2); // { dg-error "'X' has not been declared" }