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

8235149: javac parser is too aggressive on ambiguous expressions using identifier: record

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Vicente Romero 2020-01-27 18:50:19 -05:00
parent e5a99b29f1
commit 64288e1e76
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
View File

@ -4023,7 +4023,7 @@ public class JavacParser implements Parser {
int pos = token.pos;
JCModifiers mods = modifiersOpt();
if (token.kind == CLASS ||
isRecordStart() ||
allowRecords && isRecordStart() ||
token.kind == INTERFACE ||
token.kind == ENUM) {
return List.of(classOrRecordOrInterfaceOrEnumDeclaration(mods, dc));

15
test/langtools/tools/javac/records/RecordCompilationTests.java
View File

@ -625,6 +625,19 @@ public class RecordCompilationTests extends CompilationTestCase {
Assert.check(numberOfFieldRefs == 1);
}
public void testAcceptRecordId() {
String[] testOptions = {/* no options */};
setCompileOptions(testOptions);
assertOKWithWarning("compiler.warn.restricted.type.not.allowed.preview",
"class R {\n" +
" record RR(int i) {\n" +
" return null;\n" +
" }\n" +
" class record {}\n" +
"}");
setCompileOptions(PREVIEW_OPTIONS);
}
public void testAnnos() throws Exception {
String srcTemplate =
"""
@ -861,14 +874,12 @@ public class RecordCompilationTests extends CompilationTestCase {
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
targets = processingEnv.getOptions().get("targets");
System.out.println("targets------------------------------------------------- " + targets);
for (TypeElement te : annotations) {
if (te.toString().equals("Anno")) {
checkElements(te, roundEnv, targets);
if (targets.contains("TYPE_USE")) {
Element element = processingEnv.getElementUtils().getTypeElement("R");
numberOfTypeAnnotations = 0;
System.out.println("element found --------------------------------- " + element);
checkTypeAnnotations(element);
Assert.check(numberOfTypeAnnotations == 4);
}