diff --git a/src/rose/rose_build_add.cpp b/src/rose/rose_build_add.cpp index f2ef2ca9..a0ccb7ae 100644 --- a/src/rose/rose_build_add.cpp +++ b/src/rose/rose_build_add.cpp @@ -1777,7 +1777,6 @@ bool RoseBuildImpl::addOutfix(const NGHolder &h, const raw_som_dfa &haig) { bool RoseBuildImpl::addOutfix(const raw_puff &rp) { if (!mpv_outfix) { mpv_outfix = make_unique(MpvProto()); - mpv_outfix->chained = true; } auto *mpv = mpv_outfix->mpv(); @@ -1803,7 +1802,6 @@ bool RoseBuildImpl::addChainTail(const raw_puff &rp, u32 *queue_out, u32 *event_out) { if (!mpv_outfix) { mpv_outfix = make_unique(MpvProto()); - mpv_outfix->chained = true; } auto *mpv = mpv_outfix->mpv(); diff --git a/src/rose/rose_build_bytecode.cpp b/src/rose/rose_build_bytecode.cpp index fe090380..f79bce5b 100644 --- a/src/rose/rose_build_bytecode.cpp +++ b/src/rose/rose_build_bytecode.cpp @@ -1340,7 +1340,7 @@ void prepMpv(RoseBuildImpl &tbi, build_context &bc, size_t *historyRequired, assert(!mpv_outfix); mpv_outfix = &out; } else { - assert(!out.chained); + assert(!out.mpv()); } } @@ -1348,7 +1348,6 @@ void prepMpv(RoseBuildImpl &tbi, build_context &bc, size_t *historyRequired, return; } - assert(mpv_outfix->chained); auto *mpv = mpv_outfix->mpv(); auto nfa = mpvCompile(mpv->puffettes, mpv->triggered_puffettes); assert(nfa); @@ -1408,7 +1407,7 @@ bool prepOutfixes(RoseBuildImpl &tbi, build_context &bc, assert(tbi.qif.allocated_count() == bc.engineOffsets.size()); for (auto &out : tbi.outfixes) { - if (out.chained) { + if (out.mpv()) { continue; /* already done */ } DEBUG_PRINTF("building outfix %zd\n", &out - &tbi.outfixes[0]); diff --git a/src/rose/rose_build_impl.h b/src/rose/rose_build_impl.h index 4b9f6f10..4122e0bd 100644 --- a/src/rose/rose_build_impl.h +++ b/src/rose/rose_build_impl.h @@ -385,7 +385,6 @@ struct OutfixInfo { depth minWidth = depth::infinity(); depth maxWidth = 0; u64a maxOffset = 0; - bool chained = false; bool in_sbmatcher = false; //!< handled by small-block matcher. private: diff --git a/src/rose/rose_build_merge.cpp b/src/rose/rose_build_merge.cpp index 664aaef7..7a329e9a 100644 --- a/src/rose/rose_build_merge.cpp +++ b/src/rose/rose_build_merge.cpp @@ -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 som_dfas; for (auto &outfix : tbi.outfixes) { - assert(!outfix.chained); if (outfix.rdfa()) { dfas.push_back(outfix.rdfa()); } else if (outfix.holder()) {