Kapt: Always use raw types for annotation parameter types (KT-30346)

plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt

@@ -818,7 +818,15 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati
                     else -> null
                 }
             },
-            ifNonError = { genericSignature.returnType }
+            ifNonError = ifNonError@ {
+                if (descriptor is PropertyDescriptor) {
+                    val containingClass = descriptor.containingDeclaration
+                    if (containingClass is ClassDescriptor && containingClass.kind == ClassKind.ANNOTATION_CLASS) {
+                        return@ifNonError jcReturnType
+                    }
+                }
+                genericSignature.returnType
+            }
         )
 
         return Pair(genericSignature, returnType)

plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/ClassFileToSourceStubConverterTestGenerated.java

@@ -354,6 +354,11 @@ public class ClassFileToSourceStubConverterTestGenerated extends AbstractClassFi
         runTest("plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.kt");
     }
 
+    @TestMetadata("outProjection.kt")
+    public void testOutProjection() throws Exception {
+        runTest("plugins/kapt3/kapt3-compiler/testData/converter/outProjection.kt");
+    }
+
     @TestMetadata("primitiveTypes.kt")
     public void testPrimitiveTypes() throws Exception {
         runTest("plugins/kapt3/kapt3-compiler/testData/converter/primitiveTypes.kt");

plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt

@@ -28,9 +28,9 @@ public abstract @interface Anno2 {
 
     public abstract Colors[] colors() default {Colors.BLACK, Colors.WHITE};
 
-    public abstract java.lang.Class<?> clazz();
+    public abstract java.lang.Class clazz();
 
-    public abstract java.lang.Class<?>[] classes();
+    public abstract java.lang.Class[] classes();
 }
 
 ////////////////////

plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt

@@ -4,7 +4,7 @@ import kotlin.reflect.KClass;
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Anno {
 
-    public abstract java.lang.Class<java.lang.Object> a();
+    public abstract java.lang.Class a();
 }
 
 ////////////////////

plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt

@@ -159,7 +159,7 @@ public abstract interface IFoo {
         @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
         public static abstract @interface Anno {
 
-            public abstract java.lang.Class<?>[] value();
+            public abstract java.lang.Class[] value();
         }
 
         @kotlin.Metadata()

plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt

@@ -164,7 +164,7 @@ public abstract interface IFoo {
         @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
         public static abstract @interface Anno {
 
-            public abstract java.lang.Class<?>[] value();
+            public abstract java.lang.Class[] value();
         }
 
         @kotlin.Metadata()

plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt

@@ -5,13 +5,13 @@ import kotlin.reflect.KClass;
 @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
 public abstract @interface Anno {
 
-    public abstract java.lang.Class<?> a();
+    public abstract java.lang.Class a();
 
-    public abstract java.lang.Class<?>[] b();
+    public abstract java.lang.Class[] b();
 
-    public abstract java.lang.Class<?>[] c();
+    public abstract java.lang.Class[] c();
 
-    public abstract java.lang.Class<?>[] d();
+    public abstract java.lang.Class[] d();
 }
 
 ////////////////////

plugins/kapt3/kapt3-compiler/testData/converter/outProjection.kt

@@ -0,0 +1,10 @@
+import kotlin.reflect.KClass;
+
+annotation class Anno(val baseClass: KClass<out Intf<*, *, *>>)
+
+interface Intf<S, R, A>
+
+abstract class Base<S, R, A> : Intf<S, R, A>
+
+@Anno(baseClass = Base::class)
+interface Impl

plugins/kapt3/kapt3-compiler/testData/converter/outProjection.txt

@@ -0,0 +1,40 @@
+import java.lang.System;
+
+@kotlin.Metadata()
+@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+public abstract @interface Anno {
+
+    public abstract java.lang.Class baseClass();
+}
+
+////////////////////
+
+
+import java.lang.System;
+
+@kotlin.Metadata()
+public abstract class Base<S extends java.lang.Object, R extends java.lang.Object, A extends java.lang.Object> implements Intf<S, R, A> {
+
+    public Base() {
+        super();
+    }
+}
+
+////////////////////
+
+
+import java.lang.System;
+
+@kotlin.Metadata()
+@Anno(baseClass = Base.class)
+public abstract interface Impl {
+}
+
+////////////////////
+
+
+import java.lang.System;
+
+@kotlin.Metadata()
+public abstract interface Intf<S extends java.lang.Object, R extends java.lang.Object, A extends java.lang.Object> {
+}

plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt

@@ -48,7 +48,7 @@ public abstract @interface AnnoClass {
 
     public abstract int x();
 
-    public abstract java.lang.Class<Color> c();
+    public abstract java.lang.Class c();
 }
 
 ////////////////////