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

directly construct records of known types, rather than requiring coercion

Browse source
This commit is contained in:
Vern Paxson 2021-05-30 17:47:28 -07:00
parent d165db6909
commit 9a429808ab
6 changed files with 81 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/script_opt/Expr.cc
View file

@ -1827,7 +1827,14 @@ ExprPtr HasFieldExpr::Duplicate()
ExprPtr RecordConstructorExpr::Duplicate()
{
auto op_l = op->Duplicate()->AsListExprPtr();
return SetSucc(new RecordConstructorExpr(op_l));
if ( map )
{
auto rt = cast_intrusive<RecordType>(type);
return SetSucc(new RecordConstructorExpr(rt, op_l));
}
else
return SetSucc(new RecordConstructorExpr(op_l));
}
bool RecordConstructorExpr::HasReducedOps(Reducer* c) const

2
src/script_opt/GenRDs.cc
View file

@ -1084,7 +1084,7 @@ TraversalCode RD_Decorate::PreExpr(const Expr* e)
{
auto r = static_cast<const RecordConstructorExpr*>(e);
auto l = r->Op();
mgr.SetPreFromPre(l, e);
mgr.SetPreFromPre(l.get(), e);
break;
}

2
src/script_opt/UseDefs.cc
View file

@ -482,7 +482,7 @@ UDs UseDefs::ExprUDs(const Expr* e)
case EXPR_RECORD_CONSTRUCTOR:
{
auto r = static_cast<const RecordConstructorExpr*>(e);
AddInExprUDs(uds, r->Op());
AddInExprUDs(uds, r->Op().get());
break;
}