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

AST code working

Browse source
This commit is contained in:
Vern Paxson 2024-05-09 15:11:32 -07:00
parent 1961e1243f
commit 694095c56f
3 changed files with 48 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/script_opt/Expr.cc
View file

@ -2860,18 +2860,19 @@ RecordFieldUpdates::RecordFieldUpdates(ExprTag t, const std::vector<const Stmt*>
: BinaryExpr(t, get_RFU_LHS_var(stmts[0]), get_RFU_RHS_var(stmts[0])) {
for ( auto s : stmts ) {
auto s_e = s->AsExprStmt()->StmtExpr();
auto lhs = s_e->GetOp1();
auto lhs = s_e->GetOp1()->GetOp1();
auto lhs_field = lhs->AsFieldExpr()->Field();
auto rhs = s_e->GetOp2();
if ( rhs->Tag() != EXPR_FIELD )
rhs = rhs->GetOp2();
auto rhs_field = rhs->GetOp2()->AsFieldExpr()->Field();
auto rhs_field = rhs->AsFieldExpr()->Field();
lhs_map.push_back(lhs_field);
rhs_map.push_back(rhs_field);
ASSERT(stmt_pool.count(s) > 0);
stmt_pool.erase(s);
}
}
@ -2901,6 +2902,26 @@ void RecordFieldUpdates::ExprDescribe(ODesc* d) const {
op2->Describe(d);
}
ExprPtr RecordFieldUpdates::Reduce(Reducer* c, StmtPtr& red_stmt) {
if ( c->Optimizing() ) {
op1 = c->UpdateExpr(op1);
op2 = c->UpdateExpr(op2);
}
red_stmt = nullptr;
if ( ! op1->IsSingleton(c) )
op1 = op1->ReduceToSingleton(c, red_stmt);
StmtPtr red2_stmt;
if ( ! op2->IsSingleton(c) )
op2 = op2->ReduceToSingleton(c, red2_stmt);
red_stmt = MergeStmts(red_stmt, std::move(red2_stmt));
return ThisPtr();
}
ExprPtr AssignRecordFields::Duplicate() {
auto e1 = op1->Duplicate();
auto e2 = op2->Duplicate();

1
src/script_opt/Expr.h
View file

@ -115,6 +115,7 @@ public:
bool IsPure() const override { return false; }
bool IsReduced(Reducer* c) const override;
ExprPtr Reduce(Reducer* c, StmtPtr& red_stmt) override;
protected:
RecordFieldUpdates(ExprTag t, const std::vector<const Stmt*>& stmts, std::set<const Stmt*>& stmt_pool);

33
src/script_opt/Stmt.cc
View file

@ -856,12 +856,24 @@ static void UpdateAssignmentChains(const StmtPtr& s, OpChain& assign_chains, OpC
cf->second.push_back(s.get());
}
static void TransformChain(const OpChain& c, ExprTag t, std::set<const Stmt*>& chain_stmts) {
for ( auto& id_stmts : c )
for ( auto i_s : id_stmts.second ) {
ASSERT(chain_stmts.count(i_s) > 0);
chain_stmts.erase(i_s);
static StmtPtr TransformChain(const OpChain& c, ExprTag t, std::set<const Stmt*>& chain_stmts, StmtPtr s0) {
auto sl = with_location_of(make_intrusive<StmtList>(), s0);
auto& stmts = sl->Stmts();
for ( auto& id_stmts : c ) {
auto orig_s = id_stmts.second;
ExprPtr e;
if ( t == EXPR_ASSIGN )
e = make_intrusive<AssignRecordFields>(orig_s, chain_stmts);
else
e = make_intrusive<AddRecordFields>(orig_s, chain_stmts);
e->SetLocationInfo(sl->GetLocationInfo());
auto es = with_location_of(make_intrusive<ExprStmt>(std::move(e)), sl);
stmts.emplace_back(std::move(es));
}
return sl;
}
static bool SimplifyChain(const std::vector<StmtPtr>& stmts, unsigned int start, unsigned int end,
@ -890,13 +902,14 @@ static bool SimplifyChain(const std::vector<StmtPtr>& stmts, unsigned int start,
return false;
}
TransformChain(assign_chains, EXPR_ASSIGN, chain_stmts);
TransformChain(add_chains, EXPR_ADD, chain_stmts);
f_stmts.push_back(TransformChain(assign_chains, EXPR_ASSIGN, chain_stmts, stmts[start]));
f_stmts.push_back(TransformChain(add_chains, EXPR_ADD, chain_stmts, stmts[start]));
printf("chain reduction %d -> %lu starting at %s\n", end - start + 1, chain_stmts.size(),
obj_desc(stmts[start].get()).c_str());
for ( auto s : stmts )
if ( chain_stmts.count(s.get()) > 0 )
f_stmts.push_back(s);
return false;
return true;
}
bool StmtList::ReduceStmt(unsigned int& s_i, std::vector<StmtPtr>& f_stmts, Reducer* c) {