github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

SET_GROUPS instr: don't generate more than one

Browse Source
This commit is contained in:
Justin Viiret 2016-02-08 13:32:21 +11:00 committed by Matthew Barr
parent 314da68085
commit 961e303ff3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rose/rose_build_bytecode.cpp
View File

@ -3269,10 +3269,6 @@ void makeRoleInfixTriggers(RoseBuildImpl &build, build_context &bc,
sort(begin(infix_program), end(infix_program)); sort(begin(infix_program), end(infix_program));
unique_copy(begin(infix_program), end(infix_program), unique_copy(begin(infix_program), end(infix_program),
back_inserter(program)); back_inserter(program));
// Groups may be cleared by an infix going quiet. Set groups immediately
// after infixes are triggered.
makeRoleGroups(g[u].groups, program);
} }
static static
@ -3373,9 +3369,13 @@ vector<RoseInstruction> makeProgram(RoseBuildImpl &build, build_context &bc,
makeRoleReports(build, bc, v, program); makeRoleReports(build, bc, v, program);
makeRoleInfixTriggers(build, bc, v, program); makeRoleInfixTriggers(build, bc, v, program);
// Note: SET_GROUPS instruction must be after infix triggers, as an infix
// going dead may switch off groups.
makeRoleGroups(g[v].groups, program);
makeRoleSuffix(build, bc, v, program); makeRoleSuffix(build, bc, v, program);
makeRoleSetState(bc, v, program); makeRoleSetState(bc, v, program);
makeRoleGroups(g[v].groups, program);
return program; return program;
} }