Move getConflictingAltSubsets calculation, reduce its usage

This patch moves the calculation of conflicting als subsets in ParserATNSimulator::execATNWithFullContext() to the point where it is actually needed. In our benchmark, this saves about 10% of calls to getConflictingAltSubsets(). Signed-off-by: Andreas Buhr <[email protected]>
antlr · Apr 10, 2024 · 37293ab · 37293ab
1 parent 360c86c
commit 37293ab
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp b/runtime/Cpp/runtime/src/atn/ParserATNSimulator.cpp
@@ -388,13 +388,13 @@ size_t ParserATNSimulator::execATNWithFullContext(dfa::DFA &dfa, dfa::DFAState *
         delete previous;
     previous = nullptr;
 
-    std::vector<BitSet> altSubSets = PredictionModeClass::getConflictingAltSubsets(reach.get());
     reach->uniqueAlt = getUniqueAlt(reach.get());
     // unique prediction?
     if (reach->uniqueAlt != ATN::INVALID_ALT_NUMBER) {
       predictedAlt = reach->uniqueAlt;
       break;
     }
+    std::vector<BitSet> altSubSets = PredictionModeClass::getConflictingAltSubsets(reach.get());
     if (_mode != PredictionMode::LL_EXACT_AMBIG_DETECTION) {
       predictedAlt = PredictionModeClass::resolvesToJustOneViableAlt(altSubSets);
       if (predictedAlt != ATN::INVALID_ALT_NUMBER) {