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

Adjust some Reducer ref-counting and IntrusivePtr usage

Browse source
This commit is contained in:
Jon Siwek 2021-01-14 00:24:12 -08:00
parent 7ce4351ed0
commit b4cf393475
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/script_opt/Reduce.cc
View file

@ -33,15 +33,12 @@ ExprPtr Reducer::GenTemporaryExpr(const TypePtr& t, ExprPtr rhs)
return e;
}
NameExpr* Reducer::UpdateName(NameExpr* n)
NameExprPtr Reducer::UpdateName(NameExprPtr n)
{
if ( NameIsReduced(n) )
{
Ref(n);
if ( NameIsReduced(n.get()) )
return n;
}
return new NameExpr(FindNewLocal(n));
return make_intrusive<NameExpr>(FindNewLocal(n.get()));
}
bool Reducer::NameIsReduced(const NameExpr* n) const
@ -58,7 +55,10 @@ void Reducer::UpdateIDs(IDPList* ids)
IDPtr id = {NewRef{}, (*ids)[i]};
if ( ! ID_IsReduced(id) )
{
Unref((*ids)[i]);
(*ids)[i] = UpdateID(id).release();
}
}
}
@ -198,7 +198,7 @@ TempVar* Reducer::FindTemporary(const ID* id) const
return tmp->second;
}
Stmt* Reducer::MergeStmts(const NameExpr* lhs, ExprPtr rhs, Stmt* succ_stmt)
StmtPtr Reducer::MergeStmts(const NameExpr* lhs, ExprPtr rhs, Stmt* succ_stmt)
{
// First check for tmp=rhs.
auto lhs_id = lhs->Id();
@ -254,7 +254,7 @@ Stmt* Reducer::MergeStmts(const NameExpr* lhs, ExprPtr rhs, Stmt* succ_stmt)
nullptr, nullptr, false);
TrackExprReplacement(rhs.get(), merge_e.get());
return new ExprStmt(merge_e);
return make_intrusive<ExprStmt>(merge_e);
}
void Reducer::TrackExprReplacement(const Expr* orig, const Expr* e)