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

better name for key variable in script optimization

Browse source
This commit is contained in:
Vern Paxson 2024-01-10 18:43:55 -08:00 • committed by Arne Welzel
parent cb4900847d
commit 24e182f080
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/script_opt/GenIDDefs.cc
View file

@ -50,7 +50,7 @@ void GenIDDefs::TraverseFunction(const FuncPtr& f, ScopePtr scope, StmtPtr body)
} }
TraversalCode GenIDDefs::PreStmt(const Stmt* s) { TraversalCode GenIDDefs::PreStmt(const Stmt* s) {
curr_stmt = s; last_stmt_traversed = s;
auto si = s->GetOptInfo(); auto si = s->GetOptInfo();
si->stmt_num = ++stmt_num; si->stmt_num = ++stmt_num;
@ -122,11 +122,11 @@ TraversalCode GenIDDefs::PreStmt(const Stmt* s) {
t_branch->Traverse(this); t_branch->Traverse(this);
if ( ! t_branch->NoFlowAfter(false) ) if ( ! t_branch->NoFlowAfter(false) )
BranchBeyond(curr_stmt, s, true); BranchBeyond(last_stmt_traversed, s, true);
f_branch->Traverse(this); f_branch->Traverse(this);
if ( ! f_branch->NoFlowAfter(false) ) if ( ! f_branch->NoFlowAfter(false) )
BranchBeyond(curr_stmt, s, true); BranchBeyond(last_stmt_traversed, s, true);
EndConfluenceBlock(true); EndConfluenceBlock(true);
@ -155,7 +155,7 @@ TraversalCode GenIDDefs::PreStmt(const Stmt* s) {
body->Traverse(this); body->Traverse(this);
if ( ! body->NoFlowAfter(false) ) if ( ! body->NoFlowAfter(false) )
BranchBackTo(curr_stmt, s, true); BranchBackTo(last_stmt_traversed, s, true);
EndConfluenceBlock(); EndConfluenceBlock();
@ -183,7 +183,7 @@ TraversalCode GenIDDefs::PreStmt(const Stmt* s) {
body->Traverse(this); body->Traverse(this);
if ( ! body->NoFlowAfter(false) ) if ( ! body->NoFlowAfter(false) )
BranchBackTo(curr_stmt, s, true); BranchBackTo(last_stmt_traversed, s, true);
EndConfluenceBlock(); EndConfluenceBlock();
@ -242,7 +242,7 @@ TraversalCode GenIDDefs::PostStmt(const Stmt* s) {
case STMT_RETURN: ReturnAt(s); break; case STMT_RETURN: ReturnAt(s); break;
case STMT_NEXT: BranchBackTo(curr_stmt, FindLoop(), false); break; case STMT_NEXT: BranchBackTo(last_stmt_traversed, FindLoop(), false); break;
case STMT_BREAK: { case STMT_BREAK: {
auto target = FindBreakTarget(); auto target = FindBreakTarget();
@ -403,8 +403,9 @@ void GenIDDefs::CheckVarUsage(const Expr* e, const ID* id) {
auto oi = id->GetOptInfo(); auto oi = id->GetOptInfo();
if ( ! oi->DidUndefinedWarning() && ! oi->IsDefinedBefore(curr_stmt) && ! id->GetAttr(ATTR_IS_ASSIGNED) ) { if ( ! oi->DidUndefinedWarning() && ! oi->IsDefinedBefore(last_stmt_traversed) &&
if ( ! oi->IsPossiblyDefinedBefore(curr_stmt) ) { ! id->GetAttr(ATTR_IS_ASSIGNED) ) {
if ( ! oi->IsPossiblyDefinedBefore(last_stmt_traversed) ) {
e->Warn("used without definition"); e->Warn("used without definition");
oi->SetDidUndefinedWarning(); oi->SetDidUndefinedWarning();
} }
@ -423,7 +424,7 @@ void GenIDDefs::StartConfluenceBlock(const Stmt* s) {
void GenIDDefs::EndConfluenceBlock(bool no_orig) { void GenIDDefs::EndConfluenceBlock(bool no_orig) {
for ( auto id : modified_IDs.back() ) for ( auto id : modified_IDs.back() )
id->GetOptInfo()->ConfluenceBlockEndsAfter(curr_stmt, no_orig); id->GetOptInfo()->ConfluenceBlockEndsAfter(last_stmt_traversed, no_orig);
confluence_blocks.pop_back(); confluence_blocks.pop_back();
modified_IDs.pop_back(); modified_IDs.pop_back();
@ -489,7 +490,7 @@ void GenIDDefs::TrackID(const ID* id, const ExprPtr& e) {
// here to set the lowest limit for definitions. For now we leave // here to set the lowest limit for definitions. For now we leave
// DefinedAfter as capable of supporting that distinction in case we // DefinedAfter as capable of supporting that distinction in case we
// find need to revive it in the future. // find need to revive it in the future.
oi->DefinedAfter(curr_stmt, e, confluence_blocks, 0); oi->DefinedAfter(last_stmt_traversed, e, confluence_blocks, 0);
// Ensure we track this identifier across all relevant // Ensure we track this identifier across all relevant
// confluence regions. // confluence regions.

4
src/script_opt/GenIDDefs.h
View file

@ -82,8 +82,8 @@ private:
// outer "break" in that context. // outer "break" in that context.
FunctionFlavor func_flavor; FunctionFlavor func_flavor;
// The statement we are currently traversing. // The most recently traversed statement.
const Stmt* curr_stmt = nullptr; const Stmt* last_stmt_traversed = nullptr;
// Used to number Stmt objects found during AST traversal. // Used to number Stmt objects found during AST traversal.
int stmt_num; int stmt_num;