From 9be0feeadeeac2166fbe3823421bc5712bc59087 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 15 Jul 2022 09:51:50 -0400 Subject: [PATCH] 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 2333b58c9892667545d0c2c3ecd2d7b947197511) --- gcc/cp/pt.cc | 5 ++++- gcc/testsuite/g++.dg/template/redecl5.C | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/redecl5.C diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 80fadead0f74..bef31416fb77 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -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; } diff --git a/gcc/testsuite/g++.dg/template/redecl5.C b/gcc/testsuite/g++.dg/template/redecl5.C new file mode 100644 index 000000000000..fb2d698e6bc6 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/redecl5.C @@ -0,0 +1,5 @@ +// PR c++/106311 +// { dg-do compile } + +template struct array; // { dg-error "template parameter" } +template struct array { }; // { dg-error "declared" } -- 2.47.3