Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 20:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add warning for ineffective &default arguments in handlers

Browse source 
For event/hook handlers that had a previous declaration, any &default
arguments are ineffective.  Only &default uses in the initial
prototype's arguments have an effect (that includes if the handler
is actually the site at which the declaration occurs).
This commit is contained in:
Jon Siwek 2020-04-09 22:34:34 -07:00
parent 9243341e8c
commit 640dbea57c
6 changed files with 99 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/Var.cc
View file

@ -471,22 +471,46 @@ void begin_func(ID* id, const char* module_name, function_flavor flavor,
if ( id->Type() )
{
prototype = func_type_check(id->Type()->AsFuncType(), t.get());
auto decl = id->Type()->AsFuncType();
prototype = func_type_check(decl, t.get());
if ( prototype )
{
// If a previous declaration of the function had &default params,
// automatically transfer any that are missing (convenience so that
// implementations don't need to specify the &default expression again).
transfer_arg_defaults(prototype->args.get(), t->Args());
if ( decl->Flavor() == FUNC_FLAVOR_FUNCTION )
{
// If a previous declaration of the function had &default
// params, automatically transfer any that are missing
// (convenience so that implementations don't need to specify
// the &default expression again).
transfer_arg_defaults(prototype->args.get(), t->Args());
}
else
{
// Warn for trying to use &default parameters in hook/event
// handler body when it already has a declaration since only
// &default in the declaration has any effect.
auto args = t->Args();
for ( int i = 0; i < args->NumFields(); ++i )
{
auto f = args->FieldDecl(i);
if ( f->attrs && f->attrs->FindAttr(ATTR_DEFAULT) )
{
reporter->PushLocation(args->GetLocationInfo());
reporter->Warning(
"&default on parameter '%s' has no effect (not a %s declaration)",
args->FieldName(i), t->FlavorString().data());
reporter->PopLocation();
}
}
}
if ( prototype->deprecated )
t->Warn("use of deprecated prototype", id);
}
else
{
auto decl = id->Type()->AsFuncType();
// Allow renaming arguments, but only for the canonical
// prototypes of hooks/events.
if ( canonical_arg_types_match(decl, t.get()) )