Load Class<?> as KClass<*> for Java annotations parameters

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.java

@@ -0,0 +1,7 @@
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface JavaAnn {
+    Class<?>[] args();
+}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameter.kt

@@ -0,0 +1,11 @@
+class O
+class K
+
+JavaAnn(args = array(O::class, K::class)) class MyClass
+
+fun box(): String {
+    val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).args()
+    val argName1 = args[0].simpleName ?: "fail 1"
+    val argName2 = args[1].simpleName ?: "fail 2"
+    return argName1 + argName2
+}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.java

@@ -0,0 +1,13 @@
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface JavaAnn {
+    Class<?>[] args();
+}
+
+class O {}
+class K {}
+
+@JavaAnn(args = {O.class, K.class})
+class MyJavaClass {}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/arrayClassParameterOnJavaClass.kt

@@ -0,0 +1,6 @@
+fun box(): String {
+    val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).args()
+    val argName1 = args[0].simpleName ?: "fail 1"
+    val argName2 = args[1].simpleName ?: "fail 2"
+    return argName1 + argName2
+}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.java

@@ -0,0 +1,7 @@
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface JavaAnn {
+    Class<?> value();
+}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameter.kt

@@ -0,0 +1,10 @@
+
+class OK
+
+JavaAnn(OK::class) class MyClass
+
+fun box(): String {
+    val ann = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>())
+    if (ann == null) return "fail: cannot find JavaAnn on MyClass"
+    return ann.value().simpleName!!
+}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.java

@@ -0,0 +1,12 @@
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface JavaAnn {
+    Class<?> value();
+}
+
+class OK {}
+
+@JavaAnn(OK.class)
+class MyJavaClass {}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/classParameterOnJavaClass.kt

@@ -0,0 +1,6 @@
+
+fun box(): String {
+    val ann = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>())
+    if (ann == null) return "fail: cannot find JavaAnn on MyClass"
+    return ann.value().simpleName!!
+}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.java

@@ -0,0 +1,7 @@
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface JavaAnn {
+    Class<?>[] value();
+}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameter.kt

@@ -0,0 +1,11 @@
+class O
+class K
+
+JavaAnn(O::class, K::class) class MyClass
+
+fun box(): String {
+    val args = javaClass<MyClass>().getAnnotation(javaClass<JavaAnn>()).value()
+    val argName1 = args[0].simpleName ?: "fail 1"
+    val argName2 = args[1].simpleName ?: "fail 2"
+    return argName1 + argName2
+}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.java

@@ -0,0 +1,13 @@
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface JavaAnn {
+    Class<?>[] value();
+}
+
+class O {}
+class K {}
+
+@JavaAnn({O.class, K.class})
+class MyJavaClass {}

compiler/testData/codegen/boxAgainstJava/annotations/kClassMapping/varargClassParameterOnJavaClass.kt

@@ -0,0 +1,9 @@
+class O
+class K
+
+fun box(): String {
+    val args = javaClass<MyJavaClass>().getAnnotation(javaClass<JavaAnn>()).value()
+    val argName1 = args[0].simpleName ?: "fail 1"
+    val argName2 = args[1].simpleName ?: "fail 2"
+    return argName1 + argName2
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt

@@ -8,7 +8,7 @@ public final annotation class A : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public abstract fun value(): kotlin.String
-    public abstract fun x(): java.lang.Class<*>
-    public abstract fun x1(): java.lang.Class<*>
-    public abstract fun x2(): java.lang.Class<*>
+    public abstract fun x(): kotlin.reflect.KClass<*>
+    public abstract fun x1(): kotlin.reflect.KClass<*>
+    public abstract fun x2(): kotlin.reflect.KClass<*>
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt

@@ -7,7 +7,7 @@ public final annotation class A : kotlin.Annotation {
     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
-    public abstract fun x(): java.lang.Class<*>
-    public abstract fun x1(): java.lang.Class<*>
-    public abstract fun x2(): java.lang.Class<*>
+    public abstract fun x(): kotlin.reflect.KClass<*>
+    public abstract fun x1(): kotlin.reflect.KClass<*>
+    public abstract fun x2(): kotlin.reflect.KClass<*>
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt

@@ -15,6 +15,6 @@ public final annotation class A : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public abstract fun value(): kotlin.Array<kotlin.String>
-    public abstract fun x(): java.lang.Class<*>
+    public abstract fun x(): kotlin.reflect.KClass<*>
     public abstract fun y(): kotlin.Int
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt

@@ -18,6 +18,6 @@ public final annotation class A : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     public abstract fun value(): kotlin.Array<kotlin.String>
-    public abstract fun x(): java.lang.Class<*>
+    public abstract fun x(): kotlin.reflect.KClass<*>
     public abstract fun y(): kotlin.Int
 }

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.kt

@@ -0,0 +1,19 @@
+// FILE: A.java
+public @interface A {
+    Class<?> arg() default Integer.class;
+    int x() default 1;
+    B b();
+}
+
+// FILE: B.java
+public @interface B {
+    Class<?> arg() default String.class;
+    int y() default 2;
+}
+
+// FILE: c.kt
+A(arg = String::class, b = B(y = 1)) class MyClass1
+
+A(b = B(y = 3)) class MyClass2
+
+A(arg = String::class, b = B(arg = Boolean::class)) class MyClass3

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt

@@ -0,0 +1,41 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int = ..., /*2*/ b: B)
+    public abstract fun arg(): kotlin.reflect.KClass<*>
+    public abstract fun b(): B
+    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
+    public abstract fun x(): kotlin.Int
+}
+
+public final annotation class B : kotlin.Annotation {
+    public constructor B(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int = ...)
+    public abstract fun arg(): kotlin.reflect.KClass<*>
+    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
+    public abstract fun y(): kotlin.Int
+}
+
+A(arg = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, b = B(y = IntegerValueType(1): IntegerValueType(1)): B) internal final class MyClass1 {
+    public constructor MyClass1()
+    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
+}
+
+A(b = B(y = IntegerValueType(3): IntegerValueType(3)): B) internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}
+
+A(arg = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, b = B(arg = kotlin.Boolean::class: kotlin.reflect.KClass<kotlin.Boolean>): B) internal final class MyClass3 {
+    public constructor MyClass3()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.kt

@@ -0,0 +1,7 @@
+// FILE: A.java
+public @interface A {
+    Class<?> arg();
+}
+
+// FILE: b.kt
+A(arg = String::class) class MyClass3

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt

@@ -0,0 +1,16 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>)
+    public abstract fun arg(): kotlin.reflect.KClass<*>
+    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
+}
+
+A(arg = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass3 {
+    public constructor MyClass3()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.kt

@@ -0,0 +1,9 @@
+// FILE: A.java
+public @interface A {
+    Class<?> arg();
+    int x() default 1;
+}
+
+// FILE: b.kt
+A(arg = String::class) class MyClass1
+A(arg = String::class, x = 2) class MyClass2

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt

@@ -0,0 +1,24 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...)
+    public abstract fun arg(): kotlin.reflect.KClass<*>
+    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
+    public abstract fun x(): kotlin.Int
+}
+
+A(arg = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass1 {
+    public constructor MyClass1()
+    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
+}
+
+A(arg = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, x = IntegerValueType(2): IntegerValueType(2)) internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.kt

@@ -0,0 +1,7 @@
+// FILE: A.java
+public @interface A {
+    Class<?>[] arg();
+}
+
+// FILE: b.kt
+A(arg = array(String::class, Int::class)) class MyClass

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt

@@ -0,0 +1,16 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ arg: kotlin.Array<kotlin.reflect.KClass<*>>)
+    public abstract fun arg(): kotlin.Array<kotlin.reflect.KClass<*>>
+    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
+}
+
+A(arg = {kotlin.String::class, kotlin.Int::class}: kotlin.Array<kotlin.reflect.KClass<*>>) internal final class MyClass {
+    public constructor MyClass()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.kt

@@ -0,0 +1,8 @@
+// FILE: A.java
+public @interface A {
+    Class<?> arg() default Integer.class;
+}
+
+// FILE: b.kt
+A(arg = String::class) class MyClass1
+A class MyClass2

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt

@@ -0,0 +1,23 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ...)
+    public abstract fun arg(): kotlin.reflect.KClass<*>
+    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
+}
+
+A(arg = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass1 {
+    public constructor MyClass1()
+    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
+}
+
+A() internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.kt

@@ -0,0 +1,9 @@
+// FILE: A.java
+public @interface A {
+    Class<?> arg() default Integer.class;
+    int x();
+}
+
+// FILE: b.kt
+A(arg = String::class, x = 4) class MyClass2
+A(x = 5) class MyClass3

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt

@@ -0,0 +1,24 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int)
+    public abstract fun arg(): kotlin.reflect.KClass<*>
+    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
+    public abstract fun x(): kotlin.Int
+}
+
+A(arg = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, x = IntegerValueType(4): IntegerValueType(4)) internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}
+
+A(x = IntegerValueType(5): IntegerValueType(5)) internal final class MyClass3 {
+    public constructor MyClass3()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.kt

@@ -0,0 +1,8 @@
+// FILE: A.java
+public @interface A {
+    Class<?> arg1();
+    Class<?> arg2();
+}
+
+// FILE: b.kt
+A(arg1 = String::class, arg2 = Int::class) class MyClass

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt

@@ -0,0 +1,17 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ arg1: kotlin.reflect.KClass<*>, /*1*/ arg2: kotlin.reflect.KClass<*>)
+    public abstract fun arg1(): kotlin.reflect.KClass<*>
+    public abstract fun arg2(): kotlin.reflect.KClass<*>
+    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
+}
+
+A(arg1 = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, arg2 = kotlin.Int::class: kotlin.reflect.KClass<kotlin.Int>) internal final class MyClass {
+    public constructor MyClass()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.kt

@@ -0,0 +1,8 @@
+// FILE: A.java
+public @interface A {
+    Class<?> value();
+}
+
+// FILE: b.kt
+A(String::class) class MyClass1
+A(value = String::class) class MyClass2

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt

@@ -0,0 +1,23 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ value: kotlin.reflect.KClass<*>)
+    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
+    public abstract fun value(): kotlin.reflect.KClass<*>
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass1 {
+    public constructor MyClass1()
+    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
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.kt

@@ -0,0 +1,12 @@
+// FILE: A.java
+public @interface A {
+    Class<?> value();
+    int x() default 1;
+}
+
+// FILE: b.kt
+A(String::class) class MyClass1
+A(value = String::class) class MyClass2
+
+A(String::class, x = 2) class MyClass3
+A(value = String::class, x = 4) class MyClass4

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt

@@ -0,0 +1,38 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...)
+    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
+    public abstract fun value(): kotlin.reflect.KClass<*>
+    public abstract fun x(): kotlin.Int
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass1 {
+    public constructor MyClass1()
+    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
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, x = IntegerValueType(2): IntegerValueType(2)) internal final class MyClass3 {
+    public constructor MyClass3()
+    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
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, x = IntegerValueType(4): IntegerValueType(4)) internal final class MyClass4 {
+    public constructor MyClass4()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.kt

@@ -0,0 +1,9 @@
+// FILE: A.java
+public @interface A {
+    Class<?>[] value();
+}
+
+// FILE: b.kt
+A(String::class, Int::class) class MyClass1
+A(*array(String::class, Int::class)) class MyClass2
+A(value = *array(String::class, Int::class)) class MyClass3

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt

@@ -0,0 +1,30 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
+    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
+    public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
+}
+
+A(value = {kotlin.String::class, kotlin.Int::class}: kotlin.Array<out kotlin.reflect.KClass<*>>) internal final class MyClass1 {
+    public constructor MyClass1()
+    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
+}
+
+A(value = {kotlin.String::class, kotlin.Int::class}: kotlin.Array<kotlin.reflect.KClass<out kotlin.Comparable<out kotlin.Any?>>>) internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}
+
+A(value = {kotlin.String::class, kotlin.Int::class}: kotlin.Array<kotlin.reflect.KClass<out kotlin.Comparable<out kotlin.Any?>>>) internal final class MyClass3 {
+    public constructor MyClass3()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.kt

@@ -0,0 +1,9 @@
+// FILE: A.java
+public @interface A {
+    Class<?> value() default Integer.class;
+}
+
+// FILE: b.kt
+A(String::class) class MyClass1
+A(value = String::class) class MyClass2
+A class MyClass3

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt

@@ -0,0 +1,30 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ...)
+    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
+    public abstract fun value(): kotlin.reflect.KClass<*>
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass1 {
+    public constructor MyClass1()
+    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
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>) internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}
+
+A() internal final class MyClass3 {
+    public constructor MyClass3()
+    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
+}

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.kt

@@ -0,0 +1,10 @@
+// FILE: A.java
+public @interface A {
+    Class<?> value() default Integer.class;
+    int x();
+}
+
+// FILE: b.kt
+A(String::class, x = 2) class MyClass1
+A(value = String::class, x = 4) class MyClass2
+A(x = 5) class MyClass3

compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt

@@ -0,0 +1,31 @@
+package
+
+public final annotation class A : kotlin.Annotation {
+    public constructor A(/*0*/ value: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int)
+    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
+    public abstract fun value(): kotlin.reflect.KClass<*>
+    public abstract fun x(): kotlin.Int
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, x = IntegerValueType(2): IntegerValueType(2)) internal final class MyClass1 {
+    public constructor MyClass1()
+    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
+}
+
+A(value = kotlin.String::class: kotlin.reflect.KClass<kotlin.String>, x = IntegerValueType(4): IntegerValueType(4)) internal final class MyClass2 {
+    public constructor MyClass2()
+    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
+}
+
+A(x = IntegerValueType(5): IntegerValueType(5)) internal final class MyClass3 {
+    public constructor MyClass3()
+    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
+}

compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt

@@ -4,11 +4,11 @@ public open class ClassObjectArrayInParam {
     public constructor ClassObjectArrayInParam()
 
     public final annotation class Anno : kotlin.Annotation {
-        public constructor Anno(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array<out java.lang.Class<*>>*/)
-        public abstract fun value(): kotlin.Array<java.lang.Class<*>>
+        public constructor Anno(/*0*/ vararg value: kotlin.reflect.KClass<*> /*kotlin.Array<out kotlin.reflect.KClass<*>>*/)
+        public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
     }
 
-    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<out java.lang.Class<*>>) public open class Nested {
+    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<out kotlin.reflect.KClass<*>>) public open class Nested {
         public constructor Nested()
     }
 }

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt

@@ -4,8 +4,8 @@ public open class ClassObjectInParam {
     public constructor ClassObjectInParam()
 
     public final annotation class Anno : kotlin.Annotation {
-        public constructor Anno(/*0*/ value: java.lang.Class<*>)
-        public abstract fun value(): java.lang.Class<*>
+        public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>)
+        public abstract fun value(): kotlin.reflect.KClass<*>
     }
 
     test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested {

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.java

@@ -0,0 +1,11 @@
+package test;
+
+public class ClassObjectInParamRaw {
+    public @interface Anno {
+        Class value();
+        Class[] arg();
+    }
+
+    @Anno(value = ClassObjectInParamRaw.class, arg = {})
+    public static class Nested {}
+}

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.txt

@@ -0,0 +1,15 @@
+package test
+
+public open class ClassObjectInParamRaw {
+    public constructor ClassObjectInParamRaw()
+
+    public final annotation class Anno : kotlin.Annotation {
+        public constructor Anno(/*0*/ value: kotlin.reflect.KClass<*>, /*1*/ arg: kotlin.Array<kotlin.reflect.KClass<*>>)
+        public abstract fun arg(): kotlin.Array<kotlin.reflect.KClass<*>>
+        public abstract fun value(): kotlin.reflect.KClass<*>
+    }
+
+    test.ClassObjectInParamRaw.Anno(arg = {}: kotlin.Array<kotlin.reflect.KClass<*>>, value = test.ClassObjectInParamRaw.class: java.lang.Class<test.ClassObjectInParamRaw>) public open class Nested {
+        public constructor Nested()
+    }
+}

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.java

@@ -0,0 +1,17 @@
+package test;
+
+public class ClassObjectInParamVariance {
+    public @interface Anno {
+        Class<? extends Integer> arg1();
+        Class<? super Integer> arg2();
+
+        Class<? extends Integer>[] arg3();
+        Class<? super Integer>[] arg4();
+
+        Class<? extends Class<?>>[] arg5();
+        Class<? super Class<?>>[] arg6();
+
+        Class<? extends Class<Integer>>[] arg7();
+        Class<? super Class<Integer>>[] arg8();
+    }
+}

compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.txt

@@ -0,0 +1,17 @@
+package test
+
+public open class ClassObjectInParamVariance {
+    public constructor ClassObjectInParamVariance()
+
+    public final annotation class Anno : kotlin.Annotation {
+        public constructor Anno(/*0*/ arg1: kotlin.reflect.KClass<out kotlin.Int!>, /*1*/ arg2: kotlin.reflect.KClass<in kotlin.Int!>, /*2*/ arg3: kotlin.Array<kotlin.reflect.KClass<out kotlin.Int!>>, /*3*/ arg4: kotlin.Array<kotlin.reflect.KClass<in kotlin.Int!>>, /*4*/ arg5: kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<*>!>>, /*5*/ arg6: kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<*>!>>, /*6*/ arg7: kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<kotlin.Int!>!>>, /*7*/ arg8: kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<kotlin.Int!>!>>)
+        public abstract fun arg1(): kotlin.reflect.KClass<out kotlin.Int!>
+        public abstract fun arg2(): kotlin.reflect.KClass<in kotlin.Int!>
+        public abstract fun arg3(): kotlin.Array<kotlin.reflect.KClass<out kotlin.Int!>>
+        public abstract fun arg4(): kotlin.Array<kotlin.reflect.KClass<in kotlin.Int!>>
+        public abstract fun arg5(): kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<*>!>>
+        public abstract fun arg6(): kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<*>!>>
+        public abstract fun arg7(): kotlin.Array<kotlin.reflect.KClass<out java.lang.Class<kotlin.Int!>!>>
+        public abstract fun arg8(): kotlin.Array<kotlin.reflect.KClass<in java.lang.Class<kotlin.Int!>!>>
+    }
+}