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

refinements to LambdaExpr's to provide flexibility, support for ZVal captures

Browse source
This commit is contained in:
Vern Paxson 2023-06-16 15:48:48 -07:00 • committed by Arne Welzel
parent 06522c0264
commit 46983cfb2f
7 changed files with 194 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/script_opt/Expr.cc
View file

@ -2425,23 +2425,60 @@ StmtPtr CallExpr::ReduceToSingletons(Reducer* c)
ExprPtr LambdaExpr::Duplicate()
{
auto ingr = std::make_unique<FunctionIngredients>(*ingredients);
ingr->SetBody(ingr->Body()->Duplicate());
return SetSucc(new LambdaExpr(std::move(ingr), outer_ids));
return SetSucc(new LambdaExpr(this));
}
ExprPtr LambdaExpr::Inline(Inliner* inl)
bool LambdaExpr::IsReduced(Reducer* c) const
{
// Don't inline these, we currently don't get the closure right.
return ThisPtr();
if ( ! captures )
return true;
for ( auto& cp : *captures )
{
auto& cid = cp.Id();
if ( private_captures.count(cid.get()) == 0 && ! c->ID_IsReduced(cid) )
return NonReduced(this);
}
return true;
}
bool LambdaExpr::HasReducedOps(Reducer* c) const
{
return IsReduced(c);
}
ExprPtr LambdaExpr::Reduce(Reducer* c, StmtPtr& red_stmt)
{
if ( c->Optimizing() )
return ThisPtr();
else
return AssignToTemporary(c, red_stmt);
UpdateCaptures(c);
return AssignToTemporary(c, red_stmt);
}
StmtPtr LambdaExpr::ReduceToSingletons(Reducer* c)
{
UpdateCaptures(c);
return nullptr;
}
void LambdaExpr::UpdateCaptures(Reducer* c)
{
if ( captures )
{
for ( auto& cp : *captures )
{
auto& cid = cp.Id();
if ( private_captures.count(cid.get()) == 0 )
cp.SetID(c->UpdateID(cid));
}
c->UpdateIDs(&outer_ids);
}
}
ExprPtr EventExpr::Duplicate()