OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++: ICE with erroneous template redeclaration [PR106311] 

Here we ICE trying to get DECL_SOURCE_LOCATION of the parm that happens
to be error_mark_node in this ill-formed test.  I kept running into this
while reducing code, so it'd be good to have it fixed.

	PR c++/106311

gcc/cp/ChangeLog:

	* pt.cc (redeclare_class_template): Check DECL_P before accessing
	DECL_SOURCE_LOCATION.

gcc/testsuite/ChangeLog:

	* g++.dg/template/redecl5.C: New test.

(cherry picked from commit 2333b58c98)
This commit is contained in:
Marek Polacek 2022-07-15 09:51:50 -04:00
parent 60954a06ce
commit 9be0feeade
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/pt.cc
View File

@ -6315,7 +6315,10 @@ redeclare_class_template (tree type, tree parms, tree cons)
{
auto_diagnostic_group d;
error ("template parameter %q+#D", tmpl_parm);
inform (DECL_SOURCE_LOCATION (parm), "redeclared here as %q#D", parm);
if (DECL_P (parm))
inform (DECL_SOURCE_LOCATION (parm), "redeclared here as %q#D", parm);
else
inform (input_location, "redeclared here");
return false;
}

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

@ -0,0 +1,5 @@
// PR c++/106311
// { dg-do compile }
template <typename, long> struct array; // { dg-error "template parameter" }
template <typename, size_t X> struct array { }; // { dg-error "declared" }