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

8243057: compilation of annotated static record fields fails with NPE

Browse Source 
Reviewed-by: jlahoda
This commit is contained in:
Vicente Romero 2020-07-24 10:34:18 -04:00
parent 77c4adbeb5
commit 75d642a467
2 changed files with 35 additions and 3 deletions
src/jdk.compiler/share/classes/com/sun/tools/javac/comp
Check.java
test/langtools/tools/javac/records
RecordCompilationTests.java

5
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java

@ -2907,10 +2907,9 @@ public class Check {
*/
private void validateAnnotation(JCAnnotation a, JCTree declarationTree, Symbol s) {
validateAnnotationTree(a);
boolean isRecordMember = (s.flags_field & RECORD) != 0 || s.enclClass() != null && s.enclClass().isRecord();
boolean isRecordMember = ((s.flags_field & RECORD) != 0 || s.enclClass() != null && s.enclClass().isRecord());
boolean isRecordField = isRecordMember &&
(s.flags_field & (Flags.PRIVATE | Flags.FINAL | Flags.GENERATED_MEMBER | Flags.RECORD)) != 0 &&
boolean isRecordField = (s.flags_field & RECORD) != 0 &&
declarationTree.hasTag(VARDEF) &&
s.owner.kind == TYP;

33
test/langtools/tools/javac/records/RecordCompilationTests.java

@ -1563,4 +1563,37 @@ public class RecordCompilationTests extends CompilationTestCase {
"""
);
}
public void testNoNPEStaticAnnotatedFields() {
assertOK(
"""
import java.lang.annotation.Native;
record R() {
@Native public static final int i = 0;
}
"""
);
assertOK(
"""
import java.lang.annotation.Native;
class Outer {
record R() {
@Native public static final int i = 0;
}
}
"""
);
assertOK(
"""
import java.lang.annotation.Native;
class Outer {
void m() {
record R () {
@Native public static final int i = 0;
}
}
}
"""
);
}
}