SONARJAVA-1389 SE: cache count of visits access.

Author: benzonico

java-squid/src/main/java/org/sonar/java/se/ExplodedGraphWalker.java

@@ -485,7 +485,7 @@ public void enqueue(ExplodedGraph.ProgramPoint programPoint, ProgramState progra
       throw new ExplodedGraphTooBigException("Program state constraints are too big : stopping Symbolic Execution for method "
         + methodTree.simpleName().name() + "in class " + methodTree.symbol().owner().name());
     }
-    ExplodedGraph.Node cachedNode = explodedGraph.getNode(programPoint, programState.visitingPoint(programPoint));
+    ExplodedGraph.Node cachedNode = explodedGraph.getNode(programPoint, programState.visitedPoint(programPoint, nbOfExecution + 1));
     if (!cachedNode.isNew) {
       // has been enqueued earlier
       return;

java-squid/src/main/java/org/sonar/java/se/ProgramState.java

@@ -197,8 +197,8 @@ public void accept(Symbol symbol, SymbolicValue value) {
     return reachable[0];
   }
 
-  public ProgramState visitingPoint(ExplodedGraph.ProgramPoint programPoint) {
-    return new ProgramState(values, constraints, visitedPoints.put(programPoint, numberOfTimeVisited(programPoint) + 1), stack);
+  public ProgramState visitedPoint(ExplodedGraph.ProgramPoint programPoint, int nbOfVisit) {
+    return new ProgramState(values, constraints, visitedPoints.put(programPoint, nbOfVisit), stack);
   }
 
   @CheckForNull