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

fix & btest for ZAM bug with inlined nested loop

Browse source
This commit is contained in:
Vern Paxson 2022-04-01 14:04:50 -07:00
parent aa8f11fa17
commit 84dc430e00
3 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/script_opt/ZAM/Driver.cc
View file

@ -261,7 +261,7 @@ void ZAMCompiler::ComputeLoopLevels()
// We're extending an existing loop. Find
// its current end.
auto depth = t->loop_depth;
while ( j < i && insts1[j]->loop_depth == depth )
while ( j < i && insts1[j]->loop_depth >= depth )
++j;
ASSERT(insts1[j]->loop_depth == depth - 1);

2
testing/btest/Baseline/language.inlined-nested-loop/out Normal file
View file

@ -0,0 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
I compiled and ran!

24
testing/btest/language/inlined-nested-loop.zeek Normal file
View file

@ -0,0 +1,24 @@
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: btest-diff out
# This used to lead to an assertion failure in the ZAM compiler due to
# a bug in how it computed the lifetime of loops nested via inlining.
function is_local(host: addr): bool
{
for ( local_net in set(10.0.0.0/8) )
if ( host in local_net )
return T;
return F;
}
event zeek_init()
{
for ( host_addr in set(127.0.0.1) )
{
if ( is_local(host_addr) )
next;
}
print "I compiled and ran!";
}