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

fixes for ZAM compilation of switch statements

Browse source
This commit is contained in:
Vern Paxson 2023-07-13 11:49:44 -07:00
parent 51eec61272
commit b9949560c6
3 changed files with 57 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/script_opt/GenIDDefs.cc
View file

@ -107,37 +107,8 @@ TraversalCode GenIDDefs::PreStmt(const Stmt* s)
}
case STMT_SWITCH:
{
auto sw = s->AsSwitchStmt();
auto e = sw->StmtExpr();
e->Traverse(this);
StartConfluenceBlock(sw);
for ( const auto& c : *sw->Cases() )
{
auto body = c->Body();
auto exprs = c->ExprCases();
if ( exprs )
exprs->Traverse(this);
auto type_ids = c->TypeCases();
if ( type_ids )
{
for ( const auto& id : *type_ids )
if ( id->Name() )
TrackID(id);
}
body->Traverse(this);
}
EndConfluenceBlock(sw->HasDefault());
AnalyzeSwitch(s->AsSwitchStmt());
return TC_ABORTSTMT;
}
case STMT_FOR:
{
@ -201,6 +172,38 @@ TraversalCode GenIDDefs::PreStmt(const Stmt* s)
}
}
void GenIDDefs::AnalyzeSwitch(const SwitchStmt* sw)
{
sw->StmtExpr()->Traverse(this);
for ( const auto& c : *sw->Cases() )
{
// Important: the confluence block is the switch statement
// itself, not the case body. This is needed so that variable
// assignments made inside case bodies that end with
// "fallthrough" are correctly propagated to the next case
// body.
StartConfluenceBlock(sw);
auto body = c->Body();
auto exprs = c->ExprCases();
if ( exprs )
exprs->Traverse(this);
auto type_ids = c->TypeCases();
if ( type_ids )
{
for ( const auto& id : *type_ids )
if ( id->Name() )
TrackID(id);
}
body->Traverse(this);
EndConfluenceBlock(false);
}
}
TraversalCode GenIDDefs::PostStmt(const Stmt* s)
{
switch ( s->Tag() )