Simplifying the code as suggested.

lahodaj · lahodaj · commit 0ee608625d2b · 2025-09-30T17:10:42.000+02:00
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -1080,7 +1080,6 @@ private Set<PatternDescription> reduceNestedPatterns(Set<PatternDescription> pat
                                                         continue NEXT_PATTERN;
                                                     }
                                                 } else if (rpOne.nested[i] instanceof RecordPattern nestedRPOne) {
-                                                    boolean foundMatchingReplaced = false;
                                                     Set<PatternDescription> pendingReplacedPatterns = new HashSet<>(replaces.getOrDefault(rpOther.nested[i], Set.of()));
 
                                                     while (!pendingReplacedPatterns.isEmpty()) {
@@ -1089,15 +1088,12 @@ private Set<PatternDescription> reduceNestedPatterns(Set<PatternDescription> pat
                                                         pendingReplacedPatterns.remove(currentReplaced);
 
                                                         if (nestedRPOne.equals(currentReplaced)) {
-                                                            foundMatchingReplaced = true;
-                                                            break;
+                                                            continue ACCEPT;
                                                         }
 
                                                         pendingReplacedPatterns.addAll(replaces.getOrDefault(currentReplaced, Set.of()));
                                                     }
-                                                    if (!foundMatchingReplaced) {
-                                                        continue NEXT_PATTERN;
-                                                    }
+                                                    continue NEXT_PATTERN;
                                                 } else {
                                                     continue NEXT_PATTERN;
                                                 }

Original file line number	Diff line number	Diff line change
`@@ -1080,7 +1080,6 @@ private Set<PatternDescription> reduceNestedPatterns(Set<PatternDescription> pat`
`1080`	`1080`	`continue NEXT_PATTERN;`
`1081`	`1081`	`}`
`1082`	`1082`	`} else if (rpOne.nested[i] instanceof RecordPattern nestedRPOne) {`
`1083`		`- boolean foundMatchingReplaced = false;`
`1084`	`1083`	`Set<PatternDescription> pendingReplacedPatterns = new HashSet<>(replaces.getOrDefault(rpOther.nested[i], Set.of()));`
`1085`	`1084`
`1086`	`1085`	`while (!pendingReplacedPatterns.isEmpty()) {`
`@@ -1089,15 +1088,12 @@ private Set<PatternDescription> reduceNestedPatterns(Set<PatternDescription> pat`
`1089`	`1088`	`pendingReplacedPatterns.remove(currentReplaced);`
`1090`	`1089`
`1091`	`1090`	`if (nestedRPOne.equals(currentReplaced)) {`
`1092`		`- foundMatchingReplaced = true;`
`1093`		`- break;`
	`1091`	`+ continue ACCEPT;`
`1094`	`1092`	`}`
`1095`	`1093`
`1096`	`1094`	`pendingReplacedPatterns.addAll(replaces.getOrDefault(currentReplaced, Set.of()));`
`1097`	`1095`	`}`
`1098`		`- if (!foundMatchingReplaced) {`
`1099`		`- continue NEXT_PATTERN;`
`1100`		`- }`
	`1096`	`+ continue NEXT_PATTERN;`
`1101`	`1097`	`} else {`
`1102`	`1098`	`continue NEXT_PATTERN;`
`1103`	`1099`	`}`