stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8287808: javac generates illegal class file for pattern matching switch with records

Browse Source 
Reviewed-by: sundar
This commit is contained in:
Jan Lahoda 2022-06-07 13:41:24 +00:00
parent 905bcbe34e
commit 2f62f15b09
4 changed files with 12 additions and 4 deletions
src/jdk.compiler/share/classes/com/sun/tools/javac/comp
TransPatterns.java
test/langtools/tools/javac
annotations/typeAnnotations/classfile
Patterns.java
patterns
SimpleDeconstructionPattern.javaSimpleDeconstructionPatternNoPreview.out

2
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java

@ -354,7 +354,7 @@ public class TransPatterns extends TreeTranslator {
types.erasure(component.type),
List.nil(),
syms.methodClass);
MethodSymbol proxy = new MethodSymbol(Flags.STATIC | Flags.SYNTHETIC,
MethodSymbol proxy = new MethodSymbol(Flags.PRIVATE | Flags.STATIC | Flags.SYNTHETIC,
names.fromString("$proxy$" + component.name),
type,
currentClass);

4
test/langtools/tools/javac/annotations/typeAnnotations/classfile/Patterns.java

@ -245,9 +245,9 @@ public class Patterns {
value=[@Patterns$DeconstructionPattern$A,@Patterns$DeconstructionPattern$A]
)
static java.lang.String $proxy$s(Patterns$DeconstructionPattern$R);
private static java.lang.String $proxy$s(Patterns$DeconstructionPattern$R);
descriptor: (LPatterns$DeconstructionPattern$R;)Ljava/lang/String;
flags: (0x1008) ACC_STATIC, ACC_SYNTHETIC
flags: (0x100a) ACC_PRIVATE, ACC_STATIC, ACC_SYNTHETIC
static {};
descriptor: ()V

8
test/langtools/tools/javac/patterns/SimpleDeconstructionPattern.java

@ -112,6 +112,9 @@ public class SimpleDeconstructionPattern {
if (!testGen3(new GenRecord1<>(3, ""))) {
throw new IllegalStateException();
}
if (!I.testInInterface(new P2(new P(0), ""))) {
throw new IllegalStateException();
}
}
private static void exp(Object o) throws Throwable {
@ -188,6 +191,11 @@ public class SimpleDeconstructionPattern {
return o instanceof GenRecord1<Integer, String>(var i, var s) && i.intValue() == 3 && s.length() == 0;
}
interface I {
public static boolean testInInterface(Object o) {
return o instanceof P2(P(int i), var s) && i == 0;
}
}
public record P(int i) {
}

2
test/langtools/tools/javac/patterns/SimpleDeconstructionPatternNoPreview.out

@ -1,2 +1,2 @@
SimpleDeconstructionPattern.java:118:27: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.deconstruction.patterns)
SimpleDeconstructionPattern.java:121:27: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.deconstruction.patterns)
1 error