Re: [PATCH] c++, v2: Diagnose [basic.scope.block]/2 violations even for block externs [PR52953]
On 9/1/23 09:34, Jakub Jelinek wrote: On Thu, Aug 31, 2023 at 05:46:28PM -0400, Jason Merrill wrote: I've suggested this to Core. Thanks. So, I'm not really sure what to do. Intuitively the patch seems right because even block externs redeclare stuff and change meaning of the identifiers and void foo () { int i; extern int i (int); } is rejected by all compilers. I think this direction makes sense, though we might pedwarn on these rather than error to reduce possible breakage. It wasn't clear to me whether you want to make those pedwarns just for the DECL_EXTERNAL cases, ones that actually changed, or all others as well (which were errors or permerrors depending on the case). I've implemented the former, kept existing behavior of !DECL_EXTERNAL. 2023-08-31 Jakub Jelinek PR c++/52953 * name-lookup.cc (check_local_shadow): Defer punting on DECL_EXTERNAL (decl) from the start of function to right before the -Wshadow* checks. Don't we want to consider externs for the -Wshadow* checks as well? I think that is a good idea (though dunno how much it will trigger in real-world), but there is one case I've excluded, the global variable shadowing case, because warning that int z; void foo () { extern int z; z = 1; } shadows the global var would be incorrect, it is the same var. It is true that int y; namespace N { void bar () { extern int y; y = 1; } } shadows ::y but it is unclear how to differentiate those two cases with the information we have at check_local_shadow time. I've also found one spot which wasn't using auto_diagnostic_group d; on a pair of error_at/inform. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? OK. 2023-09-01 Jakub Jelinek PR c++/52953 * name-lookup.cc (check_local_shadow): Don't punt early for DECL_EXTERNAL decls, instead just disable the shadowing of namespace decls check for those and emit a pedwarn rather than error_at for those. Add missing auto_diagnostic_group. Formatting fix. * g++.dg/diagnostic/redeclaration-4.C: New test. * g++.dg/diagnostic/redeclaration-5.C: New test. * g++.dg/warn/Wshadow-19.C: New test. --- gcc/cp/name-lookup.cc.jj2023-09-01 10:21:03.658118594 +0200 +++ gcc/cp/name-lookup.cc 2023-09-01 11:30:10.868516494 +0200 @@ -3096,10 +3096,6 @@ check_local_shadow (tree decl) if (TREE_CODE (decl) == PARM_DECL && !DECL_CONTEXT (decl)) return; - /* External decls are something else. */ - if (DECL_EXTERNAL (decl)) -return; - tree old = NULL_TREE; cp_binding_level *old_scope = NULL; if (cxx_binding *binding = outer_binding (DECL_NAME (decl), NULL, true)) @@ -3130,11 +3126,9 @@ check_local_shadow (tree decl) && DECL_CONTEXT (old) == lambda_function (current_lambda_expr ()) && TREE_CODE (old) == PARM_DECL && DECL_NAME (decl) != this_identifier) - { - error_at (DECL_SOURCE_LOCATION (old), - "lambda parameter %qD " - "previously declared as a capture", old); - } + error_at (DECL_SOURCE_LOCATION (old), + "lambda parameter %qD " + "previously declared as a capture", old); return; } /* Don't complain if it's from an enclosing function. */ @@ -3156,10 +3150,18 @@ check_local_shadow (tree decl) in the outermost block of the function definition. */ if (b->kind == sk_function_parms) { - error_at (DECL_SOURCE_LOCATION (decl), - "declaration of %q#D shadows a parameter", decl); - inform (DECL_SOURCE_LOCATION (old), - "%q#D previously declared here", old); + auto_diagnostic_group d; + bool emit = true; + if (DECL_EXTERNAL (decl)) + emit = pedwarn (DECL_SOURCE_LOCATION (decl), OPT_Wpedantic, + "declaration of %q#D shadows a parameter", + decl); + else + error_at (DECL_SOURCE_LOCATION (decl), + "declaration of %q#D shadows a parameter", decl); + if (emit) + inform (DECL_SOURCE_LOCATION (old), + "%q#D previously declared here", old); return; } } @@ -3185,10 +3187,16 @@ check_local_shadow (tree decl) && (old_scope->kind == sk_cond || old_scope->kind == sk_for)) { auto_diagnostic_group d; - error_at (DECL_SOURCE_LOCATION (decl), - "redeclaration of %q#D", decl); - inform (DECL_SOURCE_LOCATION (old), - "%q#D previously declared here", old); + bool emit = true; + if (DECL_EXTERNAL (decl)) + emit = pedwarn (DECL_SOURCE_LOCATION (decl), OPT_Wpedantic, +
[PATCH] c++, v2: Diagnose [basic.scope.block]/2 violations even for block externs [PR52953]
On Thu, Aug 31, 2023 at 05:46:28PM -0400, Jason Merrill wrote: > I've suggested this to Core. Thanks. > > So, I'm not really sure what to do. Intuitively the patch seems right > > because even block externs redeclare stuff and change meaning of the > > identifiers and void foo () { int i; extern int i (int); } is rejected > > by all compilers. > > I think this direction makes sense, though we might pedwarn on these rather > than error to reduce possible breakage. It wasn't clear to me whether you want to make those pedwarns just for the DECL_EXTERNAL cases, ones that actually changed, or all others as well (which were errors or permerrors depending on the case). I've implemented the former, kept existing behavior of !DECL_EXTERNAL. > > 2023-08-31 Jakub Jelinek > > > > PR c++/52953 > > * name-lookup.cc (check_local_shadow): Defer punting on > > DECL_EXTERNAL (decl) from the start of function to right before > > the -Wshadow* checks. > > Don't we want to consider externs for the -Wshadow* checks as well? I think that is a good idea (though dunno how much it will trigger in real-world), but there is one case I've excluded, the global variable shadowing case, because warning that int z; void foo () { extern int z; z = 1; } shadows the global var would be incorrect, it is the same var. It is true that int y; namespace N { void bar () { extern int y; y = 1; } } shadows ::y but it is unclear how to differentiate those two cases with the information we have at check_local_shadow time. I've also found one spot which wasn't using auto_diagnostic_group d; on a pair of error_at/inform. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2023-09-01 Jakub Jelinek PR c++/52953 * name-lookup.cc (check_local_shadow): Don't punt early for DECL_EXTERNAL decls, instead just disable the shadowing of namespace decls check for those and emit a pedwarn rather than error_at for those. Add missing auto_diagnostic_group. Formatting fix. * g++.dg/diagnostic/redeclaration-4.C: New test. * g++.dg/diagnostic/redeclaration-5.C: New test. * g++.dg/warn/Wshadow-19.C: New test. --- gcc/cp/name-lookup.cc.jj2023-09-01 10:21:03.658118594 +0200 +++ gcc/cp/name-lookup.cc 2023-09-01 11:30:10.868516494 +0200 @@ -3096,10 +3096,6 @@ check_local_shadow (tree decl) if (TREE_CODE (decl) == PARM_DECL && !DECL_CONTEXT (decl)) return; - /* External decls are something else. */ - if (DECL_EXTERNAL (decl)) -return; - tree old = NULL_TREE; cp_binding_level *old_scope = NULL; if (cxx_binding *binding = outer_binding (DECL_NAME (decl), NULL, true)) @@ -3130,11 +3126,9 @@ check_local_shadow (tree decl) && DECL_CONTEXT (old) == lambda_function (current_lambda_expr ()) && TREE_CODE (old) == PARM_DECL && DECL_NAME (decl) != this_identifier) - { - error_at (DECL_SOURCE_LOCATION (old), - "lambda parameter %qD " - "previously declared as a capture", old); - } + error_at (DECL_SOURCE_LOCATION (old), + "lambda parameter %qD " + "previously declared as a capture", old); return; } /* Don't complain if it's from an enclosing function. */ @@ -3156,10 +3150,18 @@ check_local_shadow (tree decl) in the outermost block of the function definition. */ if (b->kind == sk_function_parms) { - error_at (DECL_SOURCE_LOCATION (decl), - "declaration of %q#D shadows a parameter", decl); - inform (DECL_SOURCE_LOCATION (old), - "%q#D previously declared here", old); + auto_diagnostic_group d; + bool emit = true; + if (DECL_EXTERNAL (decl)) + emit = pedwarn (DECL_SOURCE_LOCATION (decl), OPT_Wpedantic, + "declaration of %q#D shadows a parameter", + decl); + else + error_at (DECL_SOURCE_LOCATION (decl), + "declaration of %q#D shadows a parameter", decl); + if (emit) + inform (DECL_SOURCE_LOCATION (old), + "%q#D previously declared here", old); return; } } @@ -3185,10 +3187,16 @@ check_local_shadow (tree decl) && (old_scope->kind == sk_cond || old_scope->kind == sk_for)) { auto_diagnostic_group d; - error_at (DECL_SOURCE_LOCATION (decl), - "redeclaration of %q#D", decl); - inform (DECL_SOURCE_LOCATION (old), - "%q#D previously declared here", old); + bool emit = true; + if (DECL_EXTERNAL (decl)) + emit = pedwarn (DECL_SOURCE_LOCATION (decl), OPT_Wpedantic, + "redeclaration of