SONARJAVA-5621 Fix issue in CFG computation with generic record pattern (#5191)

Author: romainbrenguier

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

@@ -68,6 +68,7 @@
 import org.sonar.plugins.java.api.tree.NewArrayTree;
 import org.sonar.plugins.java.api.tree.NewClassTree;
 import org.sonar.plugins.java.api.tree.NullPatternTree;
+import org.sonar.plugins.java.api.tree.ParameterizedTypeTree;
 import org.sonar.plugins.java.api.tree.ParenthesizedTree;
 import org.sonar.plugins.java.api.tree.PatternInstanceOfTree;
 import org.sonar.plugins.java.api.tree.PatternTree;
@@ -88,6 +89,7 @@
 import org.sonar.plugins.java.api.tree.UnaryExpressionTree;
 import org.sonar.plugins.java.api.tree.VariableTree;
 import org.sonar.plugins.java.api.tree.WhileStatementTree;
+import org.sonar.plugins.java.api.tree.WildcardTree;
 import org.sonar.plugins.java.api.tree.YieldStatementTree;
 import org.sonarsource.analyzer.commons.collections.ListUtils;
 
@@ -687,6 +689,20 @@ private void build(Tree tree) {
         DEFAULT_PATTERN:
         buildPattern((PatternTree) tree);
         break;
+      case PARAMETERIZED_TYPE:
+        var typeTree = (ParameterizedTypeTree) tree;
+        build(typeTree.type());
+        build(typeTree.typeArguments());
+        break;
+      case UNBOUNDED_WILDCARD,
+           EXTENDS_WILDCARD,
+           SUPER_WILDCARD:
+        TypeTree bound = ((WildcardTree) tree).bound();
+        if (bound != null) {
+          build(bound);
+        }
+        currentBlock.elements.add(tree);
+        break;
       default:
         throw new UnsupportedOperationException(tree.kind().name() + " " + ((JavaTree) tree).getLine());
     }

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

@@ -59,6 +59,7 @@
 import static org.sonar.plugins.java.api.tree.Tree.Kind.DEFAULT_PATTERN;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.DO_STATEMENT;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.EQUAL_TO;
+import static org.sonar.plugins.java.api.tree.Tree.Kind.EXTENDS_WILDCARD;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.FOR_EACH_STATEMENT;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.FOR_STATEMENT;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.GREATER_THAN;
@@ -87,6 +88,7 @@
 import static org.sonar.plugins.java.api.tree.Tree.Kind.RECORD_PATTERN;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.RETURN_STATEMENT;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.STRING_LITERAL;
+import static org.sonar.plugins.java.api.tree.Tree.Kind.SUPER_WILDCARD;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.SWITCH_EXPRESSION;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.SWITCH_STATEMENT;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.SYNCHRONIZED_STATEMENT;
@@ -95,6 +97,7 @@
 import static org.sonar.plugins.java.api.tree.Tree.Kind.TYPE_CAST;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.TYPE_PATTERN;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.UNARY_MINUS;
+import static org.sonar.plugins.java.api.tree.Tree.Kind.UNBOUNDED_WILDCARD;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.VARIABLE;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.WHILE_STATEMENT;
 import static org.sonar.plugins.java.api.tree.Tree.Kind.YIELD_STATEMENT;
@@ -403,7 +406,10 @@ public ElementChecker(final Tree.Kind kind) {
           TYPE_PATTERN,
           GUARDED_PATTERN,
           DEFAULT_PATTERN,
-          RECORD_PATTERN:
+          RECORD_PATTERN,
+          UNBOUNDED_WILDCARD,
+          SUPER_WILDCARD,
+          EXTENDS_WILDCARD:
           break;
         default:
           throw new IllegalArgumentException("Unsupported element kind: " + kind);
@@ -3149,6 +3155,42 @@ void throw_statement_within_try_catch() {
 
   }
 
+  @Test
+  void generic_record_pattern() {
+    CFG cfg = buildCFG("""
+          private static boolean testGen3(GenBase<Integer, String> o) {
+            return o instanceof GenRecord1<?, ? super Integer, ? extends CharSequence>(String a, Integer i, CharSequence s) && i == 3 && s.isEmpty();
+          }
+        """);
+
+    CFGChecker cfgChecker = checker(
+      block(
+        element(IDENTIFIER, "o"),
+        element(RECORD_PATTERN),
+        element(UNBOUNDED_WILDCARD),
+        element(SUPER_WILDCARD),
+        element(IDENTIFIER, "Integer"),
+        element(EXTENDS_WILDCARD),
+        element(IDENTIFIER, "CharSequence"),
+        element(IDENTIFIER, "GenRecord1"),
+        element(TYPE_PATTERN),
+        element(VARIABLE, "a"),
+        element(TYPE_PATTERN),
+        element(VARIABLE, "i"),
+        element(TYPE_PATTERN),
+        element(VARIABLE, "s"),
+        element(PATTERN_INSTANCE_OF)
+      ).terminator(CONDITIONAL_AND).ifTrue(4).ifFalse(3),
+      block(element(IDENTIFIER, "i"), element(INT_LITERAL, "3"), element(EQUAL_TO))
+        .successors(3),
+      terminator(CONDITIONAL_AND).ifTrue(2).ifFalse(1),
+      block(element(IDENTIFIER, "s"), element(METHOD_INVOCATION))
+        .successors(1),
+      terminator(RETURN_STATEMENT).successors(0));
+
+    cfgChecker.check(cfg);
+  }
+
   @Test
   void build_partial_cfg_with_break() {
     build_partial_cfg("break");