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

squashing some bugs

Browse source
This commit is contained in:
Vern Paxson 2023-11-28 16:52:00 -08:00
parent 91335a770f
commit 24bbc024c1
3 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/script_opt/GenIDDefs.cc
View file

@ -62,8 +62,17 @@ TraversalCode GenIDDefs::PreStmt(const Stmt* s) {
auto block = cr->Block(); auto block = cr->Block();
cr_active.push_back(confluence_blocks.size()); cr_active.push_back(confluence_blocks.size());
cr_return_seen.push_back(false);
block->Traverse(this); block->Traverse(this);
if ( cr_return_seen.back() )
// We encountered a return along the way. curr_stmt is
// now set to the last statement in the block, so mark
// it with a return.
ReturnAt(curr_stmt);
cr_active.pop_back(); cr_active.pop_back();
cr_return_seen.pop_back();
auto retvar = cr->RetVar(); auto retvar = cr->RetVar();
if ( retvar ) if ( retvar )
@ -436,9 +445,11 @@ void GenIDDefs::ReturnAt(const Stmt* s) {
// If we're right at a catch-return then we don't want to make the // If we're right at a catch-return then we don't want to make the
// identifier as encountering a scope-ending "return" here. By avoiding // identifier as encountering a scope-ending "return" here. By avoiding
// that, we're able to do optimization across catch-return blocks. // that, we're able to do optimization across catch-return blocks.
if ( cr_active.empty() || cr_active.back() != confluence_blocks.size() ) if ( cr_active.empty() || cr_active.back() != confluence_blocks.size() || cr_return_seen.back() )
for ( auto id : modified_IDs.back() ) for ( auto id : modified_IDs.back() )
id->GetOptInfo()->ReturnAt(s); id->GetOptInfo()->ReturnAt(s);
if ( ! cr_active.empty() )
cr_return_seen.back() = true;
} }
void GenIDDefs::TrackID(const ID* id, const ExprPtr& e) { void GenIDDefs::TrackID(const ID* id, const ExprPtr& e) {

10
src/script_opt/GenIDDefs.h
View file

@ -93,11 +93,15 @@ private:
// Stack of confluence blocks corresponding to activate catch-return // Stack of confluence blocks corresponding to activate catch-return
// statements. We used to stop identifier definitions at these // statements. We used to stop identifier definitions at these
// boundaries, but given there's no confluence (i.e., the body of the // boundaries, but given there's limited confluence (i.e., the body of
// catch-return *will* execute), we can do broader optimization if we // the catch-return *will* execute, up through its first return), we
// don't treat them as their own (new) confluence blocks. // can do broader optimization if we don't treat them as their own
// (new) confluence blocks.
std::vector<zeek_uint_t> cr_active; std::vector<zeek_uint_t> cr_active;
// Parallel array that tracks whether a return has occurred.
std::vector<zeek_uint_t> cr_return_seen;
// The following is parallel to confluence_blocks except // The following is parallel to confluence_blocks except
// the front entry tracks identifiers at the outermost // the front entry tracks identifiers at the outermost
// (non-confluence) scope. Thus, to index it for a given // (non-confluence) scope. Thus, to index it for a given

9
src/script_opt/Reduce.cc
View file

@ -846,6 +846,15 @@ CSE_ValidityChecker::CSE_ValidityChecker(ProfileFuncs& _pfs, const std::vector<c
} }
TraversalCode CSE_ValidityChecker::PreStmt(const Stmt* s) { TraversalCode CSE_ValidityChecker::PreStmt(const Stmt* s) {
auto t = s->Tag();
if ( t == STMT_WHEN ) {
// These are too hard to analyze - they result in lambda calls
// that can affect aggregates, etc.
is_valid = false;
return TC_ABORTALL;
}
if ( s->Tag() == STMT_ADD || s->Tag() == STMT_DELETE ) if ( s->Tag() == STMT_ADD || s->Tag() == STMT_DELETE )
in_aggr_mod_stmt = true; in_aggr_mod_stmt = true;