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

c++: ICE with -Wshadow and enumerator in template [PR99120]

Browse source 
We crash here, because in a template, an enumerator doesn't have
a type until we've called finish_enum_value_list.  But our -Wshadow
implementation, check_local_shadow, is called when we pushdecl in
build_enumerator, which takes place before finish_enum_value_list.

gcc/cp/ChangeLog:

	PR c++/99120
	* name-lookup.c (check_local_shadow): Check if the type of decl
	is non-null before checking TYPE_PTR*.

gcc/testsuite/ChangeLog:

	PR c++/99120
	* g++.dg/warn/Wshadow-17.C: New test.
This commit is contained in:
Marek Polacek 2021-03-05 10:41:41 -05:00
parent 812230c63c
commit c2e64c33d9
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/name-lookup.c
View file

@ -3309,7 +3309,7 @@ check_local_shadow (tree decl)
/* Don't warn for artificial things that are not implicit typedefs. */
if (DECL_ARTIFICIAL (decl) && !DECL_IMPLICIT_TYPEDEF_P (decl))
return;
if (nonlambda_method_basetype ())
if (tree member = lookup_member (current_nonlambda_class_type (),
DECL_NAME (decl), /*protect=*/0,
@ -3321,8 +3321,9 @@ check_local_shadow (tree decl)
is a function or a pointer-to-function. */
if (!OVL_P (member)
|| TREE_CODE (decl) == FUNCTION_DECL
|| TYPE_PTRFN_P (TREE_TYPE (decl))
|| TYPE_PTRMEMFUNC_P (TREE_TYPE (decl)))
|| (TREE_TYPE (decl)
&& (TYPE_PTRFN_P (TREE_TYPE (decl))
|| TYPE_PTRMEMFUNC_P (TREE_TYPE (decl)))))
{
auto_diagnostic_group d;
if (warning_at (DECL_SOURCE_LOCATION (decl), OPT_Wshadow,

11
gcc/testsuite/g++.dg/warn/Wshadow-17.C Normal file
View file

@ -0,0 +1,11 @@
// PR c++/99120
// { dg-options "-Wshadow" }
struct S {
void X();
template<typename T>
void fn () {
enum { X };
}
};