archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8237041: AssertionError in parsing

Browse source 
Avoid parser crash for deeply nested classes without closing braces, improve error recovery for classes without an opening brace.

Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2020-08-27 16:15:11 +02:00
parent c663323043
commit 0504064717
4 changed files with 58 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

54
test/langtools/tools/javac/parser/JavacParserTest.java
View file

@ -23,7 +23,7 @@
/*
* @test
* @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 8228451
* @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 8228451 8237041
* @summary tests error and diagnostics positions
* @author Jan Lahoda
* @modules jdk.compiler/com.sun.tools.javac.api
@ -1512,6 +1512,58 @@ public class JavacParserTest extends TestCase {
}
}
@Test //JDK-8237041
void testDeepNestingNoClose() throws IOException {
//verify that many nested unclosed classes do not crash javac
//due to the safety fallback in JavacParser.reportSyntaxError:
String code = "package t; class Test {\n";
for (int i = 0; i < 100; i++) {
code += "class C" + i + " {\n";
}
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, List.of("-XDdev"),
null, Arrays.asList(new MyFileObject(code)));
Result result = ct.doCall();
assertEquals("Expected a (plain) error, got: " + result, result, Result.ERROR);
}
@Test //JDK-8237041
void testErrorRecoveryClassNotBrace() throws IOException {
//verify the AST form produced for classes without opening brace
//(classes without an opening brace do not nest the upcoming content):
String code = """
package t;
class Test {
String.class,
String.class,
class A
public
class B
}
""";
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, List.of("-XDdev"),
null, Arrays.asList(new MyFileObject(code)));
String ast = ct.parse().iterator().next().toString();
String expected = """
package t;
\n\
class Test {
String.<error> <error>;
\n\
class <error> {
}
\n\
class <error> {
}
\n\
class A {
}
\n\
public class B {
}
}""";
assertEquals("Unexpected AST, got:\n" + ast, expected, ast);
}
void run(String[] args) throws Exception {
int passed = 0, failed = 0;
final Pattern p = (args != null && args.length > 0)