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

compile inlined functions if they're also used indirectly

Browse source
This commit is contained in:
Vern Paxson 2021-06-01 09:05:01 -07:00
parent 5f4956bf24
commit 7855557e92
1 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/script_opt/ScriptOpt.cc
View file

@ -492,20 +492,50 @@ void analyze_scripts()
if ( ! analysis_options.activate ) if ( ! analysis_options.activate )
return; return;
// The following tracks inlined functions that are also used
// indirectly, and thus should be compiled even if they were
// inlined. We don't bother populating this if we're not inlining,
// since it won't be consulted in that case.
std::unordered_set<Func*> func_used_indirectly;
if ( inl )
{
for ( auto& f : funcs ) for ( auto& f : funcs )
{ {
if ( inl && inl->WasInlined(f.Func()) ) for ( const auto& g : f.Profile()->Globals() )
{
if ( g->GetType()->Tag() != TYPE_FUNC )
continue;
auto v = g->GetVal();
if ( ! v )
continue;
auto func = v->AsFunc();
if ( inl->WasInlined(func) )
func_used_indirectly.insert(func);
}
}
}
for ( auto& f : funcs )
{
auto func = f.Func();
if ( inl && inl->WasInlined(func) &&
func_used_indirectly.count(func) == 0 )
// No need to compile as it won't be // No need to compile as it won't be
// called directly. // called directly.
continue; continue;
if ( when_funcs.count(f.Func()) > 0 ) if ( when_funcs.count(func) > 0 )
// We don't try to compile these. // We don't try to compile these.
continue; continue;
auto new_body = f.Body(); auto new_body = f.Body();
optimize_func(f.Func(), f.ProfilePtr(), f.Scope(), optimize_func(func, f.ProfilePtr(), f.Scope(), new_body,
new_body, analysis_options); analysis_options);
f.SetBody(new_body); f.SetBody(new_body);
} }
} }