Merge branch 'JDK-8364991' into JDK-8367499

lahodaj · lahodaj · commit e69c20e79d5e · 2025-10-09T16:56:05.000+02:00
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ExhaustivenessComputer.java
@@ -399,7 +399,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()) {
@@ -408,15 +407,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
`@@ -399,7 +399,6 @@ private Set<PatternDescription> reduceNestedPatterns(Set<PatternDescription> pat`
`399`	`399`	`continue NEXT_PATTERN;`
`400`	`400`	`}`
`401`	`401`	`} else if (rpOne.nested[i] instanceof RecordPattern nestedRPOne) {`
`402`		`- boolean foundMatchingReplaced = false;`
`403`	`402`	`Set<PatternDescription> pendingReplacedPatterns = new HashSet<>(replaces.getOrDefault(rpOther.nested[i], Set.of()));`
`404`	`403`
`405`	`404`	`while (!pendingReplacedPatterns.isEmpty()) {`
`@@ -408,15 +407,12 @@ private Set<PatternDescription> reduceNestedPatterns(Set<PatternDescription> pat`
`408`	`407`	`pendingReplacedPatterns.remove(currentReplaced);`
`409`	`408`
`410`	`409`	`if (nestedRPOne.equals(currentReplaced)) {`
`411`		`- foundMatchingReplaced = true;`
`412`		`- break;`
	`410`	`+ continue ACCEPT;`
`413`	`411`	`}`
`414`	`412`
`415`	`413`	`pendingReplacedPatterns.addAll(replaces.getOrDefault(currentReplaced, Set.of()));`
`416`	`414`	`}`
`417`		`- if (!foundMatchingReplaced) {`
`418`		`- continue NEXT_PATTERN;`
`419`		`- }`
	`415`	`+ continue NEXT_PATTERN;`
`420`	`416`	`} else {`
`421`	`417`	`continue NEXT_PATTERN;`
`422`	`418`	`}`