SONARJAVA-1393 Fix continue in foreach statements

Author: benzonico

java-squid/src/main/java/org/sonar/java/cfg/CFG.java

@@ -661,15 +661,16 @@ private void buildDoWhileStatement(DoWhileStatementTree doWhileStatementTree) {
   private void buildForEachStatement(ForEachStatement tree) {
     // TODO(npe) One solution is to create a forstatement node depending on type of expression (iterable or array) and build CFG from it.
     Block afterLoop = currentBlock;
-    currentBlock = createBlock();
-    Block loopback = currentBlock;
+    Block statementBlock = createBlock();
+    Block loopback = createBranch(tree, statementBlock, afterLoop);
+    currentBlock = createBlock(loopback);
     addContinueTarget(loopback);
     breakTargets.addLast(afterLoop);
     build(tree.statement());
     breakTargets.removeLast();
     continueTargets.removeLast();
-    currentBlock = createBranch(tree, currentBlock, afterLoop);
-    loopback.addSuccessor(currentBlock);
+    statementBlock.addSuccessor(currentBlock);
+    currentBlock = loopback;
     build(tree.variable());
     build(tree.expression());
     currentBlock = createBlock(currentBlock);

java-squid/src/test/files/se/Reproducer.java

@@ -1,6 +1,8 @@
 package javax.annotation;
 import javax.annotation.CheckForNull;
 import java.lang.Object;
+import java.util.HashMap;
+import java.util.TreeSet;
 
 @interface CheckForNull {}
 
@@ -59,6 +61,15 @@ private void foo(boolean b) {
 
     }
     printState();
+  }
 
+  public void continue_foreach(boolean a, boolean b, Map<String, String> map) {
+    for (String prop : map.keySet()) {
+      if (b) {
+        continue;
+      }
+      String.format("  - %s=%s", prop, a ? "******" : "");
+    }
   }
+
 }

java-squid/src/test/java/org/sonar/java/cfg/CFGTest.java

@@ -669,6 +669,47 @@ public void array_loop_with_continue() {
     cfgChecker.check(cfg);
   }
 
+  @Test
+  public void foreach_loop_continue() {
+    final CFG cfg = buildCFG("void fun(){ System.out.println('start'); for(String foo:list) {System.out.println(foo); if(foo.length()> 2) {continue;}  System.out.println('');} System.out.println('end'); }");
+    final CFGChecker cfgChecker = checker(
+        block(
+            element(Tree.Kind.CHAR_LITERAL, "'start'"),
+            element(Tree.Kind.IDENTIFIER, "System"),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Tree.Kind.METHOD_INVOCATION)).successors(2),
+        block(
+            element(Tree.Kind.IDENTIFIER, "foo"),
+            element(Tree.Kind.IDENTIFIER, "System"),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Kind.METHOD_INVOCATION),
+            element(Tree.Kind.IDENTIFIER, "foo"),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Kind.METHOD_INVOCATION),
+            element(Kind.INT_LITERAL, 2),
+            element(Kind.GREATER_THAN)
+            ).terminator(Kind.IF_STATEMENT).successors(3, 4),
+        terminator(Kind.CONTINUE_STATEMENT).successors(2),
+        block(
+            element(Tree.Kind.CHAR_LITERAL, "''"),
+            element(Tree.Kind.IDENTIFIER, "System"),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Tree.Kind.METHOD_INVOCATION)).successors(2),
+        block(
+            element(Tree.Kind.IDENTIFIER, "list"),
+            element(Tree.Kind.VARIABLE, "foo")).terminator(Tree.Kind.FOR_EACH_STATEMENT).successors(1, 5),
+        block(
+            element(Tree.Kind.CHAR_LITERAL, "'end'"),
+            element(Tree.Kind.IDENTIFIER, "System"),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Tree.Kind.MEMBER_SELECT),
+            element(Tree.Kind.METHOD_INVOCATION)).successors(0));
+    cfgChecker.check(cfg);
+  }
+
   @Test
   public void foreach_loop() {
     final CFG cfg = buildCFG("void fun(){ System.out.println(''); for(String foo:list) {System.out.println(foo);} System.out.println(''); }");
@@ -678,16 +719,16 @@ public void foreach_loop() {
         element(Tree.Kind.IDENTIFIER, "System"),
         element(Tree.Kind.MEMBER_SELECT),
         element(Tree.Kind.MEMBER_SELECT),
-        element(Tree.Kind.METHOD_INVOCATION)).successors(3),
-      block(
-        element(Tree.Kind.IDENTIFIER, "list"),
-        element(Tree.Kind.VARIABLE, "foo")).terminator(Tree.Kind.FOR_EACH_STATEMENT).successors(1, 2),
+        element(Tree.Kind.METHOD_INVOCATION)).successors(2),
       block(
         element(Tree.Kind.IDENTIFIER, "foo"),
         element(Tree.Kind.IDENTIFIER, "System"),
         element(Tree.Kind.MEMBER_SELECT),
         element(Tree.Kind.MEMBER_SELECT),
-        element(Tree.Kind.METHOD_INVOCATION)).successors(3),
+        element(Tree.Kind.METHOD_INVOCATION)).successors(2),
+      block(
+        element(Tree.Kind.IDENTIFIER, "list"),
+        element(Tree.Kind.VARIABLE, "foo")).terminator(Tree.Kind.FOR_EACH_STATEMENT).successors(1, 3),
       block(
         element(Tree.Kind.CHAR_LITERAL, "''"),
         element(Tree.Kind.IDENTIFIER, "System"),