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

tidier memory management

Browse source
This commit is contained in:
Vern Paxson 2021-02-02 17:00:28 -08:00
parent be54599896
commit cb9a959978
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/script_opt/ScriptOpt.cc
View file

@ -47,12 +47,11 @@ void optimize_func(ScriptFunc* f, ProfileFunc* pf, ScopePtr scope_ptr,
auto scope = scope_ptr.release(); auto scope = scope_ptr.release();
push_existing_scope(scope); push_existing_scope(scope);
auto rc = new Reducer(scope); auto rc = std::make_unique<Reducer>(scope);
auto new_body = rc->Reduce(body); auto new_body = rc->Reduce(body);
if ( reporter->Errors() > 0 ) if ( reporter->Errors() > 0 )
{ {
delete rc;
pop_scope(); pop_scope();
return; return;
} }
@ -60,7 +59,7 @@ void optimize_func(ScriptFunc* f, ProfileFunc* pf, ScopePtr scope_ptr,
non_reduced_perp = nullptr; non_reduced_perp = nullptr;
checking_reduction = true; checking_reduction = true;
if ( ! new_body->IsReduced(rc) ) if ( ! new_body->IsReduced(rc.get()) )
{ {
if ( non_reduced_perp ) if ( non_reduced_perp )
printf("Reduction inconsistency for %s: %s\n", f->Name(), printf("Reduction inconsistency for %s: %s\n", f->Name(),
@ -87,8 +86,6 @@ void optimize_func(ScriptFunc* f, ProfileFunc* pf, ScopePtr scope_ptr,
if ( new_frame_size > f->FrameSize() ) if ( new_frame_size > f->FrameSize() )
f->SetFrameSize(new_frame_size); f->SetFrameSize(new_frame_size);
delete rc;
pop_scope(); pop_scope();
} }
@ -210,15 +207,12 @@ void analyze_scripts()
new_to_do.clear(); new_to_do.clear();
} }
Inliner* inl = nullptr; std::unique_ptr<Inliner> inl;
if ( analysis_options.inliner ) if ( analysis_options.inliner )
inl = new Inliner(funcs, analysis_options.report_recursive); inl = std::make_unique<Inliner>(funcs, analysis_options.report_recursive);
if ( ! analysis_options.activate ) if ( ! analysis_options.activate )
{
delete inl;
return; return;
}
for ( auto& f : funcs ) for ( auto& f : funcs )
{ {
@ -236,8 +230,6 @@ void analyze_scripts()
new_body, analysis_options); new_body, analysis_options);
f.SetBody(new_body); f.SetBody(new_body);
} }
delete inl;
} }