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

Remove OutfixInfo::chained (which meant "is MPV")

Browse Source
This commit is contained in:
Justin Viiret
2016-04-18 13:12:15 +10:00
committed by Matthew Barr
parent 16985ab6e5
commit 319d47ae4f
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rose/rose_build_merge.cpp
View File

@@ -2417,9 +2417,6 @@ void mergeOutfixInfo(OutfixInfo &winner, const OutfixInfo &victim) {
// layer at runtime will protect us from extra matches if only one was in
// the small block matcher.
winner.in_sbmatcher &= victim.in_sbmatcher;
// We should never have merged outfixes that differ in these properties.
assert(winner.chained == victim.chained);
}
static
@@ -2651,7 +2648,6 @@ void mergeOutfixCombo(RoseBuildImpl &tbi, const ReportManager &rm,
for (auto it = tbi.outfixes.begin(); it != tbi.outfixes.end(); ++it) {
auto &outfix = *it;
assert(!outfix.is_dead());
assert(!outfix.chained);
if (outfix.rdfa()) {
auto *rdfa = outfix.rdfa();
@@ -2727,7 +2723,6 @@ void mergeOutfixes(RoseBuildImpl &tbi) {
vector<raw_som_dfa *> som_dfas;
for (auto &outfix : tbi.outfixes) {
assert(!outfix.chained);
if (outfix.rdfa()) {
dfas.push_back(outfix.rdfa());
} else if (outfix.holder()) {