No more java Target / Retention loaded. Render java Retention / Target. Related test changes.

compiler/testData/compileJavaAgainstKotlin/targets/annotation.txt

@@ -4,6 +4,6 @@ test.meta() public/*package*/ final class MyAnn : kotlin.Annotation {
     public/*package*/ constructor MyAnn()
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE}) internal final class meta : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) kotlin.annotation.annotation() internal final class meta : kotlin.Annotation {
     public constructor meta()
 }

compiler/testData/compileJavaAgainstKotlin/targets/classifier.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.TYPE}) internal final class classifier : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER}) kotlin.annotation.annotation() internal final class classifier : kotlin.Annotation {
     public constructor classifier()
 }

compiler/testData/compileJavaAgainstKotlin/targets/constructor.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.CONSTRUCTOR}) internal final class constructor : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.CONSTRUCTOR}) kotlin.annotation.annotation() internal final class constructor : kotlin.Annotation {
     public constructor constructor()
 }

compiler/testData/compileJavaAgainstKotlin/targets/empty.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {}) internal final class empty : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {}) kotlin.annotation.annotation() internal final class empty : kotlin.Annotation {
     public constructor empty()
 }

compiler/testData/compileJavaAgainstKotlin/targets/field.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.FIELD}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.FIELD}) internal final class field : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.FIELD}) kotlin.annotation.annotation() internal final class field : kotlin.Annotation {
     public constructor field()
 }

compiler/testData/compileJavaAgainstKotlin/targets/function.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.METHOD}) internal final class function : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class function : kotlin.Annotation {
     public constructor function()
 }

compiler/testData/compileJavaAgainstKotlin/targets/getter.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.METHOD}) internal final class getter : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_GETTER}) kotlin.annotation.annotation() internal final class getter : kotlin.Annotation {
     public constructor getter()
 }

compiler/testData/compileJavaAgainstKotlin/targets/local.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.LOCAL_VARIABLE}) internal final class local : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.LOCAL_VARIABLE}) kotlin.annotation.annotation() internal final class local : kotlin.Annotation {
     public constructor local()
 }

compiler/testData/compileJavaAgainstKotlin/targets/multiple.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.TYPE, ElementType.METHOD}) internal final class multiple : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.CLASSIFIER, AnnotationTarget.FUNCTION}) kotlin.annotation.annotation() internal final class multiple : kotlin.Annotation {
     public constructor multiple()
 }

compiler/testData/compileJavaAgainstKotlin/targets/package-info.txt

@@ -3,6 +3,6 @@ package test
 test.pck() public/*package*/ interface `package-info` {
 }
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.PACKAGE}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.PACKAGE}) internal final class pck : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.PACKAGE}) kotlin.annotation.annotation() internal final class pck : kotlin.Annotation {
     public constructor pck()
 }

compiler/testData/compileJavaAgainstKotlin/targets/parameter.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.PARAMETER}) internal final class parameter : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.VALUE_PARAMETER}) kotlin.annotation.annotation() internal final class parameter : kotlin.Annotation {
     public constructor parameter()
 }

compiler/testData/compileJavaAgainstKotlin/targets/property.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {}) internal final class property : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY}) kotlin.annotation.annotation() internal final class property : kotlin.Annotation {
     public constructor property()
 }

compiler/testData/compileJavaAgainstKotlin/targets/setter.txt

@@ -1,5 +1,5 @@
 package test
 
-kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.annotation() java.lang.annotation.Target(value = {ElementType.METHOD}) internal final class setter : kotlin.Annotation {
+kotlin.annotation.target(allowedTargets = {AnnotationTarget.PROPERTY_SETTER}) kotlin.annotation.annotation() internal final class setter : kotlin.Annotation {
     public constructor setter()
 }

compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.txt

@@ -1,13 +1,13 @@
 package
 
-kotlin.annotation.annotation() internal final class my : kotlin.Annotation {
+java.lang.annotation.Retention(value = RetentionPolicy.CLASS) kotlin.annotation.annotation() internal final class my : kotlin.Annotation {
     public constructor my()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-kotlin.annotation.annotation() internal final class my1 : kotlin.Annotation {
+java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME) java.lang.annotation.Target(value = {ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR}) kotlin.annotation.annotation() internal final class my1 : kotlin.Annotation {
     public constructor my1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int

compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java

@@ -49,19 +49,12 @@ import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisit
 
 public class RecursiveDescriptorComparator {
 
-    private static final Set<FqName> excludedAnnotations = new HashSet<FqName>();
-    static {
-        excludedAnnotations.add(new FqName(ExpectedLoadErrorsUtil.ANNOTATION_CLASS_NAME));
-        excludedAnnotations.add(new FqName(Retention.class.getName()));
-        excludedAnnotations.add(new FqName(Target.class.getName()));
-    }
-
     private static final DescriptorRenderer DEFAULT_RENDERER = DescriptorRenderer.Companion.withOptions(
             new Function1<DescriptorRendererOptions, Unit>() {
                 @Override
                 public Unit invoke(DescriptorRendererOptions options) {
                     options.setWithDefinedIn(false);
-                    options.setExcludedAnnotationClasses(excludedAnnotations);
+                    options.setExcludedAnnotationClasses(Collections.singleton(new FqName(ExpectedLoadErrorsUtil.ANNOTATION_CLASS_NAME)));
                     options.setOverrideRenderingPolicy(OverrideRenderingPolicy.RENDER_OPEN_OVERRIDE);
                     options.setIncludePropertyConstant(true);
                     options.setNameShortness(NameShortness.FULLY_QUALIFIED);

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java

@@ -41,6 +41,9 @@ public final class JvmAnnotationNames {
     public static final Name TARGET_ANNOTATION_MEMBER_NAME = Name.identifier("allowedTargets");
     public static final Name RETENTION_ANNOTATION_PARAMETER_NAME = Name.identifier("retention");
 
+    public static final FqName TARGET_ANNOTATION = new FqName("java.lang.annotation.Target");
+    public static final FqName RETENTION_ANNOTATION = new FqName("java.lang.annotation.Retention");
+
     public static final FqName JETBRAINS_NOT_NULL_ANNOTATION = new FqName("org.jetbrains.annotations.NotNull");
     public static final FqName JETBRAINS_NULLABLE_ANNOTATION = new FqName("org.jetbrains.annotations.Nullable");
     public static final FqName JETBRAINS_MUTABLE_ANNOTATION = new FqName("org.jetbrains.annotations.Mutable");
@@ -118,6 +121,7 @@ public final class JvmAnnotationNames {
 
     private static final Set<JvmClassName> SPECIAL_ANNOTATIONS = new HashSet<JvmClassName>();
     private static final Set<JvmClassName> NULLABILITY_ANNOTATIONS = new HashSet<JvmClassName>();
+    private static final Set<JvmClassName> SPECIAL_META_ANNOTATIONS = new HashSet<JvmClassName>();
     static {
         for (FqName fqName : Arrays.asList(KOTLIN_CLASS, KOTLIN_PACKAGE, KOTLIN_SIGNATURE)) {
             SPECIAL_ANNOTATIONS.add(JvmClassName.byFqNameWithoutInnerClasses(fqName));
@@ -127,13 +131,16 @@ public final class JvmAnnotationNames {
         for (FqName fqName : Arrays.asList(JETBRAINS_NOT_NULL_ANNOTATION, JETBRAINS_NULLABLE_ANNOTATION)) {
             NULLABILITY_ANNOTATIONS.add(JvmClassName.byFqNameWithoutInnerClasses(fqName));
         }
+        for (FqName fqName : Arrays.asList(TARGET_ANNOTATION, RETENTION_ANNOTATION)) {
+            SPECIAL_META_ANNOTATIONS.add(JvmClassName.byFqNameWithoutInnerClasses(fqName));
+        }
     }
 
     public static boolean isSpecialAnnotation(@NotNull ClassId classId, boolean javaSpecificAnnotationsAreSpecial) {
         JvmClassName className = JvmClassName.byClassId(classId);
-        return (javaSpecificAnnotationsAreSpecial && NULLABILITY_ANNOTATIONS.contains(className))
-               || SPECIAL_ANNOTATIONS.contains(className)
-               || className.getInternalName().startsWith("jet/runtime/typeinfo/");
+        return (javaSpecificAnnotationsAreSpecial
+                && (NULLABILITY_ANNOTATIONS.contains(className) || SPECIAL_META_ANNOTATIONS.contains(className))
+               ) || SPECIAL_ANNOTATIONS.contains(className) || className.getInternalName().startsWith("jet/runtime/typeinfo/");
     }
 
     private JvmAnnotationNames() {