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

ZAM fixes for record creation and table indexing potentially having side-effects

Browse source
This commit is contained in:
Vern Paxson 2023-09-27 11:38:21 -07:00
parent 3addda28d3
commit 8f92e0d39b
4 changed files with 66 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/script_opt/Reduce.cc
View file

@ -857,6 +857,10 @@ CSE_ValidityChecker::CSE_ValidityChecker(const std::vector<const ID*>& _ids, con
start_e = _start_e;
end_e = _end_e;
for ( auto i : ids )
if ( i->IsGlobal() || IsAggr(i->GetType()) )
sensitive_to_calls = true;
// Track whether this is a record assignment, in which case
// we're attuned to assignments to the same field for the
// same type of record.
@ -991,14 +995,11 @@ TraversalCode CSE_ValidityChecker::PreExpr(const Expr* e)
break;
case EXPR_CALL:
{
for ( auto i : ids )
if ( i->IsGlobal() || IsAggr(i->GetType()) )
{
is_valid = false;
return TC_ABORTALL;
}
}
if ( sensitive_to_calls )
{
is_valid = false;
return TC_ABORTALL;
}
break;
case EXPR_TABLE_CONSTRUCTOR:
@ -1007,8 +1008,26 @@ TraversalCode CSE_ValidityChecker::PreExpr(const Expr* e)
// so we don't want to traverse them.
return TC_ABORTSTMT;
default:
if ( in_aggr_mod_stmt && (t == EXPR_INDEX || t == EXPR_FIELD) )
case EXPR_RECORD_CONSTRUCTOR:
// If these have initializations done at construction
// time, those can include function calls.
if ( sensitive_to_calls )
{
auto& et = e->GetType();
if ( et->Tag() == TYPE_RECORD && ! et->AsRecordType()->IdempotentCreation() )
{
is_valid = false;
return TC_ABORTALL;
}
}
break;
case EXPR_INDEX:
case EXPR_FIELD:
// We treat these together because they both have
// to be checked when inside an "add" or "delete"
// statement.
if ( in_aggr_mod_stmt )
{
auto aggr = e->GetOp1();
auto aggr_id = aggr->AsNameExpr()->Id();
@ -1020,6 +1039,25 @@ TraversalCode CSE_ValidityChecker::PreExpr(const Expr* e)
}
}
if ( t == EXPR_INDEX && sensitive_to_calls )
{
// Unfortunately in isolation we can't
// statically determine whether this table
// has a &default associated with it. In
// principle we could track all instances
// of the table type seen (across the
// entire set of scripts), and note whether
// any of those include an expression, but
// that's a lot of work for what might be
// minimal gain.
is_valid = false;
return TC_ABORTALL;
}
break;
default:
break;
}