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

8206325: AssertionError in TypeSymbol.getAnnotationTypeMetadata

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Srikanth Adayapalam 2018-11-30 10:37:48 +05:30
parent 1285c3cd30
commit 10d83827bc
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
View File

@ -169,9 +169,12 @@ public class TypeAnnotations {
/**
* Determine whether an annotation is a declaration annotation,
* a type annotation, or both.
* a type annotation, or both (or none, i.e a non-annotation masquerading as one).
*/
public AnnotationType annotationTargetType(Attribute.Compound a, Symbol s) {
if (!a.type.tsym.isAnnotationType()) {
return AnnotationType.NONE;
}
List<Attribute> targets = annotationTargets(a.type.tsym);
return (targets == null) ?
AnnotationType.DECLARATION :
@ -319,6 +322,8 @@ public class TypeAnnotations {
onlyTypeAnnos.append(ta);
break;
}
case NONE: // Error signaled already, just drop the non-annotation.
break;
}
}

22
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
View File

@ -344,17 +344,19 @@ public class Annotate {
Assert.checkNonNull(c, "Failed to create annotation");
if (annotated.containsKey(a.type.tsym)) {
if (!allowRepeatedAnnos) {
log.error(DiagnosticFlag.SOURCE_LEVEL, a.pos(), Feature.REPEATED_ANNOTATIONS.error(sourceName));
if (a.type.tsym.isAnnotationType()) {
if (annotated.containsKey(a.type.tsym)) {
if (!allowRepeatedAnnos) {
log.error(DiagnosticFlag.SOURCE_LEVEL, a.pos(), Feature.REPEATED_ANNOTATIONS.error(sourceName));
}
ListBuffer<T> l = annotated.get(a.type.tsym);
l = l.append(c);
annotated.put(a.type.tsym, l);
pos.put(c, a.pos());
} else {
annotated.put(a.type.tsym, ListBuffer.of(c));
pos.put(c, a.pos());
}
ListBuffer<T> l = annotated.get(a.type.tsym);
l = l.append(c);
annotated.put(a.type.tsym, l);
pos.put(c, a.pos());
} else {
annotated.put(a.type.tsym, ListBuffer.of(c));
pos.put(c, a.pos());
}
// Note: @Deprecated has no effect on local variables and parameters

2
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
View File

@ -2749,7 +2749,7 @@ public class Check {
class AnnotationValidator extends TreeScanner {
@Override
public void visitAnnotation(JCAnnotation tree) {
if (!tree.type.isErroneous()) {
if (!tree.type.isErroneous() && tree.type.tsym.isAnnotationType()) {
super.visitAnnotation(tree);
validateAnnotation(tree);
}

11
test/langtools/tools/javac/annotations/AtNonAnnotationTypeTest.java Normal file
View File

@ -0,0 +1,11 @@
/*
* @test /nodynamiccopyright/
* @bug 8206325
* @summary AssertionError in TypeSymbol.getAnnotationTypeMetadata
* @compile/fail/ref=AtNonAnnotationTypeTest.out -XDrawDiagnostics -XDdev AtNonAnnotationTypeTest.java
*/
import java.lang.annotation.Annotation;
class AtNonAnnotationTypeTest<Override extends Annotation> {
AtNonAnnotationTypeTest(@Override String foo) {}
}

2
test/langtools/tools/javac/annotations/AtNonAnnotationTypeTest.out Normal file
View File

@ -0,0 +1,2 @@
AtNonAnnotationTypeTest.java:10:28: compiler.err.not.annotation.type: Override
1 error