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

Script optimization maintenance and updates:

Browse source 
maintenance fixes for variadic run-time checks, '_' placeholder identifier
  "-O allow-cond" permits compiling scripts to C++ when influenced by @if conditionals
  more robust standalone compile-to-C++ properties
  fix for nested "when" statements
  test suite updates
This commit is contained in:
Vern Paxson 2022-11-08 11:56:32 -08:00
parent bc0284aefa
commit ee0a6f6835
40 changed files with 257 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/script_opt/ZAM/AM-Opt.cc
View file

@ -368,6 +368,10 @@ void ZAMCompiler::ComputeFrameLifetimes()
for ( auto v : iter_vars )
{
if ( v < 0 )
// This happens for '_' dummy
continue;
CheckSlotAssignment(v, inst);
// Also mark it as usage throughout the
@ -410,6 +414,13 @@ void ZAMCompiler::ComputeFrameLifetimes()
}
break;
case OP_NEXT_VECTOR_BLANK_ITER_VAL_VAR_VVV:
{
auto depth = inst->loop_depth;
ExtendLifetime(inst->v1, EndOfLoop(inst, depth));
}
break;
case OP_NEXT_VECTOR_ITER_VVV:
case OP_NEXT_STRING_ITER_VVV:
// Sometimes loops are written that don't actually
@ -423,6 +434,10 @@ void ZAMCompiler::ComputeFrameLifetimes()
ExtendLifetime(inst->v1, EndOfLoop(inst, inst->loop_depth));
break;
case OP_NEXT_VECTOR_BLANK_ITER_VV:
case OP_NEXT_STRING_BLANK_ITER_VV:
break;
case OP_INIT_TABLE_LOOP_VV:
case OP_INIT_VECTOR_LOOP_VV:
case OP_INIT_STRING_LOOP_VV:
@ -573,7 +588,9 @@ void ZAMCompiler::ReMapFrame()
auto& iter_vars = inst->aux->loop_vars;
for ( auto& v : iter_vars )
{
ASSERT(v >= 0 && v < n1_slots);
if ( v < 0 )
continue;
ASSERT(v < n1_slots);
v = frame1_to_frame2[v];
}
}