https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97511
--- Comment #2 from CVS Commits <cvs-commit at gcc dot gnu.org> --- The master branch has been updated by Patrick Palka <ppa...@gcc.gnu.org>: https://gcc.gnu.org/g:b083a14dfe1f53446722f488885078e419238d24 commit r11-4229-gb083a14dfe1f53446722f488885078e419238d24 Author: Patrick Palka <ppa...@redhat.com> Date: Thu Oct 22 07:27:55 2020 -0400 c++: Check DECL_TEMPLATE_PARM_P in duplicate_decls [PR97511] This makes duplicate_decls differentiate a TYPE_DECL for an alias template from a TYPE_DECL for one of its template parameters. The recently added assert in template_parm_to_arg revealed this latent issue because merging of the two TYPE_DECLs cleared the DECL_TEMPLATE_PARM_P flag. With this patch, we now also correctly diagnose the name shadowing in the below testcase (as required by [temp.local]/6). gcc/cp/ChangeLog: PR c++/97511 * decl.c (duplicate_decls): Return NULL_TREE if DECL_TEMPLATE_PARM_P differ. gcc/testsuite/ChangeLog: PR c++/97511 * g++.dg/template/shadow3.C: New test.