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

8062359: javac Attr crashes with NPE in TypeAnnotationsValidator visitNewClass

Browse Source 
Reviewed-by: jlahoda, vromero
This commit is contained in:
Joel Borggrén-Franck 2014-11-21 12:36:21 +01:00
parent 56e39629eb
commit 8bf55955df
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -4490,14 +4490,15 @@ public class Attr extends JCTree.Visitor {
super.visitTypeTest(tree);
}
public void visitNewClass(JCNewClass tree) {
if (tree.clazz.hasTag(ANNOTATED_TYPE)) {
checkForDeclarationAnnotations(((JCAnnotatedType) tree.clazz).annotations,
tree.clazz.type.tsym);
}
if (tree.def != null) {
checkForDeclarationAnnotations(tree.def.mods.annotations, tree.clazz.type.tsym);
}
if (tree.clazz.type != null) {
if (tree.clazz != null && tree.clazz.type != null) {
if (tree.clazz.hasTag(ANNOTATED_TYPE)) {
checkForDeclarationAnnotations(((JCAnnotatedType) tree.clazz).annotations,
tree.clazz.type.tsym);
}
if (tree.def != null) {
checkForDeclarationAnnotations(tree.def.mods.annotations, tree.clazz.type.tsym);
}
validateAnnotatedType(tree.clazz, tree.clazz.type);
}
super.visitNewClass(tree);

17
langtools/test/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java Normal file
View File

@ -0,0 +1,17 @@
/*
* @test /nodynamiccopyright/
* @bug 8062359
* @summary NullPointerException in Attr when type-annotating an anonymous
* inner class in an unresolvable class
* @compile/fail/ref=UnresolvableClassNPEInAttrTest.out -XDrawDiagnostics UnresolvableClassNPEInAttrTest.java
*/
public class UnresolvableClassNPEInAttrTest {
public static void main(String[] args) {
new Undefined() {
void test() {
new Object() {};
}
};
}
}

2
langtools/test/tools/javac/8062359/UnresolvableClassNPEInAttrTest.out Normal file
View File

@ -0,0 +1,2 @@
UnresolvableClassNPEInAttrTest.java:11:13: compiler.err.cant.resolve.location: kindname.class, Undefined, , , (compiler.misc.location: kindname.class, UnresolvableClassNPEInAttrTest, null)
1 error