Fix resolved pattern declaration resolution check for null

biboudis · Aug 31, 2024 · c3b8f0e · c3b8f0e
1 parent 69d7f7f
commit c3b8f0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -4344,7 +4344,7 @@ public void visitRecordPattern(JCRecordPattern tree) {
             List<MethodSymbol> patternDeclarations = getPatternDeclarationCandidates(site, nestedPatternCount);
 
             if (patternDeclarations.size() >= 1) {
-                MethodSymbol patternDeclaration = null;
+                MethodSymbol resolvedPatternDeclaration = null;
 
                 if (patternDeclarations.size() > 1) {
                     // precalculate types of pattern components (as in method invocation)
@@ -4355,14 +4355,14 @@ public void visitRecordPattern(JCRecordPattern tree) {
                     }
                     List<Type> patternTypes = patternTypesBuffer.toList();
 
-                    patternDeclaration = selectBestPatternDeclarationInScope(tree, site, patternDeclarations, patternTypes);
+                    resolvedPatternDeclaration = selectBestPatternDeclarationInScope(tree, site, patternDeclarations, patternTypes);
                 } else {
-                    patternDeclaration = patternDeclarations.getFirst();
+                    resolvedPatternDeclaration = patternDeclarations.getFirst();
                 }
 
-                if (patternDeclaration != null) {
-                    expectedRecordTypes = types.memberType(site, patternDeclaration).getBindingTypes();
-                    tree.patternDeclaration = patternDeclaration;
+                if (resolvedPatternDeclaration != null) {
+                    expectedRecordTypes = types.memberType(site, resolvedPatternDeclaration).getBindingTypes();
+                    tree.patternDeclaration = resolvedPatternDeclaration;
                 }
             }
         }

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
@@ -3572,8 +3572,9 @@ public PatternDescription makePatternDescription(Type selectorType, JCPattern pa
         } else if (pattern instanceof JCRecordPattern record) {
             Type[] componentTypes;
 
-            if (!record.type.isErroneous()) {
-                componentTypes = ((JCRecordPattern) pattern).patternDeclaration.type.asMethodType().bindingtypes.toArray(Type[]::new);
+            MethodSymbol patternDeclaration = ((JCRecordPattern) pattern).patternDeclaration;
+            if (!record.type.isErroneous() && patternDeclaration != null) {
+                componentTypes = patternDeclaration.type.asMethodType().bindingtypes.toArray(Type[]::new);
             }
             else {
                 componentTypes = record.nested.map(t -> types.createErrorType(t.type)).toArray(s -> new Type[s]);;