Fix assertion or stack overflow error in some full-context parsing sc…

…enarios
sharwell · Sep 21, 2014 · 685bcdc · 685bcdc
1 parent 6b6596b
commit 685bcdc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java b/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
@@ -589,7 +589,7 @@ else if ( target == ERROR ) {
 //			return -1;
 //		}
 
-		if ( s.configs.getConflictInfo()!=null ) {
+		if ( !state.useContext && s.configs.getConflictInfo()!=null ) {
 			if ( dfa.atnStartState instanceof DecisionState ) {
 				if (!userWantsCtxSensitive ||
 					(!s.configs.getDipsIntoOuterContext() && s.configs.isExactConflict()) ||